diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 11:17:37 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 11:17:37 -0500 |
commit | 56c035c9ce1f1850969778af6a4cc0b99089b6c8 (patch) | |
tree | b6f1998be0c1e6bb623a0c55e8ba04d74bb58cf2 /arch/arm/mach-s3c2440/mach-at2440evb.c | |
parent | 7f2754378f3522a42daafdbb9d2385f341008454 (diff) | |
parent | 438a5d42e052ec6126c5f1e24763b711210db33e (diff) |
Merge branch 'next-s3c64xx-device' into next-merged
Conflicts:
arch/arm/mach-s3c2440/mach-at2440evb.c
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-at2440evb.c')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-at2440evb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index 4539b1d95877..0a6d0a5d961b 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <mach/regs-mem.h> | 37 | #include <mach/regs-mem.h> |
38 | #include <mach/regs-lcd.h> | 38 | #include <mach/regs-lcd.h> |
39 | #include <plat/nand.h> | 39 | #include <plat/nand.h> |
40 | #include <plat/iic.h> | ||
40 | 41 | ||
41 | #include <linux/mtd/mtd.h> | 42 | #include <linux/mtd/mtd.h> |
42 | #include <linux/mtd/nand.h> | 43 | #include <linux/mtd/nand.h> |
@@ -205,7 +206,7 @@ static struct platform_device *at2440evb_devices[] __initdata = { | |||
205 | &s3c_device_usb, | 206 | &s3c_device_usb, |
206 | &s3c_device_wdt, | 207 | &s3c_device_wdt, |
207 | &s3c_device_adc, | 208 | &s3c_device_adc, |
208 | &s3c_device_i2c, | 209 | &s3c_device_i2c0, |
209 | &s3c_device_rtc, | 210 | &s3c_device_rtc, |
210 | &s3c_device_nand, | 211 | &s3c_device_nand, |
211 | &s3c_device_sdi, | 212 | &s3c_device_sdi, |
@@ -227,6 +228,8 @@ static void __init at2440evb_map_io(void) | |||
227 | static void __init at2440evb_init(void) | 228 | static void __init at2440evb_init(void) |
228 | { | 229 | { |
229 | s3c24xx_fb_set_platdata(&at2440evb_fb_info); | 230 | s3c24xx_fb_set_platdata(&at2440evb_fb_info); |
231 | s3c_i2c0_set_platdata(NULL); | ||
232 | |||
230 | platform_add_devices(at2440evb_devices, ARRAY_SIZE(at2440evb_devices)); | 233 | platform_add_devices(at2440evb_devices, ARRAY_SIZE(at2440evb_devices)); |
231 | } | 234 | } |
232 | 235 | ||