aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-20 19:51:40 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-20 19:51:40 +0900
commit6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (patch)
tree6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d /arch/arm/plat-samsung/Makefile
parenta2f7bffa29f18266bc7b55a2b47a5fa1274ed53f (diff)
parent5b7d7b22dc8469fbe1ca10b2adeabb70639bde01 (diff)
downloadkernel_samsung_tuna-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.zip
kernel_samsung_tuna-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.tar.gz
kernel_samsung_tuna-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.tar.bz2
ARM: Merge for-2635-4/watchdog
Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2 Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6440/include/mach/map.h arch/arm/mach-s5p6440/mach-smdk6440.c arch/arm/mach-s5pv210/Kconfig arch/arm/mach-s5pv210/include/mach/map.h arch/arm/mach-s5pv210/mach-smdkv210.c
Diffstat (limited to 'arch/arm/plat-samsung/Makefile')
-rw-r--r--arch/arm/plat-samsung/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 606ec84..d73ee55 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o
obj-y += dev-uart.o
obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o
obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o
+obj-$(CONFIG_S3C_DEV_WDT) += dev-wdt.o
obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o
obj-$(CONFIG_S3C_DEV_RTC) += dev-rtc.o