diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:51:40 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:51:40 +0900 |
| commit | 6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (patch) | |
| tree | 6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d /arch/arm/plat-samsung/Kconfig | |
| parent | ARM: S3C6410: Add basic support for SmartQ machines (diff) | |
| parent | ARM: S5PV210: Add Watchdog support for S5PV210 (diff) | |
| download | linux-dev-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.tar.xz linux-dev-6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c.zip | |
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/Kconfig')
| -rw-r--r-- | arch/arm/plat-samsung/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index b787d576d4b3..47c8aa75e747 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -190,6 +190,12 @@ config S3C_DEV_USB_HSOTG help Compile in platform device definition for USB high-speed OtG +config S3C_DEV_WDT + bool + default y if ARCH_S3C2410 + help + Complie in platform device definition for Watchdog Timer + config S3C_DEV_NAND bool help |