diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:51:40 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:51:40 -0400 |
| commit | 6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c (patch) | |
| tree | 6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d /arch/arm/mach-s3c64xx/Kconfig | |
| parent | a2f7bffa29f18266bc7b55a2b47a5fa1274ed53f (diff) | |
| parent | 5b7d7b22dc8469fbe1ca10b2adeabb70639bde01 (diff) | |
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/mach-s3c64xx/Kconfig')
| -rw-r--r-- | arch/arm/mach-s3c64xx/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig index 11d2353bc506..44a9def318fb 100644 --- a/arch/arm/mach-s3c64xx/Kconfig +++ b/arch/arm/mach-s3c64xx/Kconfig | |||
| @@ -93,6 +93,8 @@ config MACH_SMDK6410 | |||
| 93 | select SAMSUNG_DEV_TS | 93 | select SAMSUNG_DEV_TS |
| 94 | select S3C_DEV_USB_HOST | 94 | select S3C_DEV_USB_HOST |
| 95 | select S3C_DEV_USB_HSOTG | 95 | select S3C_DEV_USB_HSOTG |
| 96 | select S3C_DEV_WDT | ||
| 97 | select HAVE_S3C2410_WATCHDOG | ||
| 96 | select S3C64XX_SETUP_SDHCI | 98 | select S3C64XX_SETUP_SDHCI |
| 97 | select S3C64XX_SETUP_I2C1 | 99 | select S3C64XX_SETUP_I2C1 |
| 98 | select S3C64XX_SETUP_FB_24BPP | 100 | select S3C64XX_SETUP_FB_24BPP |