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-s5p6440/mach-smdk6440.c | |
| 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-s5p6440/mach-smdk6440.c')
| -rw-r--r-- | arch/arm/mach-s5p6440/mach-smdk6440.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6440/mach-smdk6440.c b/arch/arm/mach-s5p6440/mach-smdk6440.c index f9948174ba4e..8291fecc701a 100644 --- a/arch/arm/mach-s5p6440/mach-smdk6440.c +++ b/arch/arm/mach-s5p6440/mach-smdk6440.c | |||
| @@ -89,6 +89,7 @@ static struct platform_device *smdk6440_devices[] __initdata = { | |||
| 89 | &s5p6440_device_iis, | 89 | &s5p6440_device_iis, |
| 90 | &s3c_device_adc, | 90 | &s3c_device_adc, |
| 91 | &s3c_device_ts, | 91 | &s3c_device_ts, |
| 92 | &s3c_device_wdt, | ||
| 92 | }; | 93 | }; |
| 93 | 94 | ||
| 94 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { | 95 | static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { |