diff options
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-n30.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 7a7c45d28fe7..05a5e877b49b 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | 19 | ||
20 | #include <linux/delay.h> | ||
21 | #include <linux/gpio_keys.h> | 20 | #include <linux/gpio_keys.h> |
22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
23 | #include <linux/input.h> | 22 | #include <linux/input.h> |
@@ -320,7 +319,7 @@ static struct s3c2410fb_mach_info n30_fb_info __initdata = { | |||
320 | static struct platform_device *n30_devices[] __initdata = { | 319 | static struct platform_device *n30_devices[] __initdata = { |
321 | &s3c_device_lcd, | 320 | &s3c_device_lcd, |
322 | &s3c_device_wdt, | 321 | &s3c_device_wdt, |
323 | &s3c_device_i2c, | 322 | &s3c_device_i2c0, |
324 | &s3c_device_iis, | 323 | &s3c_device_iis, |
325 | &s3c_device_usb, | 324 | &s3c_device_usb, |
326 | &s3c_device_usbgadget, | 325 | &s3c_device_usbgadget, |
@@ -332,7 +331,7 @@ static struct platform_device *n30_devices[] __initdata = { | |||
332 | static struct platform_device *n35_devices[] __initdata = { | 331 | static struct platform_device *n35_devices[] __initdata = { |
333 | &s3c_device_lcd, | 332 | &s3c_device_lcd, |
334 | &s3c_device_wdt, | 333 | &s3c_device_wdt, |
335 | &s3c_device_i2c, | 334 | &s3c_device_i2c0, |
336 | &s3c_device_iis, | 335 | &s3c_device_iis, |
337 | &s3c_device_usbgadget, | 336 | &s3c_device_usbgadget, |
338 | &n35_button_device, | 337 | &n35_button_device, |
@@ -501,7 +500,7 @@ static void __init n30_init_irq(void) | |||
501 | static void __init n30_init(void) | 500 | static void __init n30_init(void) |
502 | { | 501 | { |
503 | s3c24xx_fb_set_platdata(&n30_fb_info); | 502 | s3c24xx_fb_set_platdata(&n30_fb_info); |
504 | s3c_device_i2c.dev.platform_data = &n30_i2ccfg; | 503 | s3c_device_i2c0.dev.platform_data = &n30_i2ccfg; |
505 | s3c24xx_udc_set_platdata(&n30_udc_cfg); | 504 | s3c24xx_udc_set_platdata(&n30_udc_cfg); |
506 | 505 | ||
507 | /* Turn off suspend on both USB ports, and switch the | 506 | /* Turn off suspend on both USB ports, and switch the |