diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-16 20:54:19 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-16 20:54:19 +0400 |
| commit | b477dfba38bd54c47ea1fe128e2fa778ede1b2f5 (patch) | |
| tree | 024e47cb0ae1cfb96c799d21abf18884ae356c18 /arch/arm/mach-s3c2410/mach-bast.c | |
| parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
| parent | 3ac19bb443255579b30f05af5e688b6c73b1bb91 (diff) | |
| download | linux-b477dfba38bd54c47ea1fe128e2fa778ede1b2f5.tar.xz | |
Merge branch 'fixes-rc5' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-bast.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 4389c160f7d0..8637dea5e150 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c @@ -588,8 +588,6 @@ static void __init bast_map_io(void) s3c_device_nand.dev.platform_data = &bast_nand_info; - s3c_i2c0_set_platdata(&bast_i2c_info); - s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc)); s3c24xx_init_clocks(0); s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs)); @@ -602,6 +600,7 @@ static void __init bast_init(void) sysdev_class_register(&bast_pm_sysclass); sysdev_register(&bast_pm_sysdev); + s3c_i2c0_set_platdata(&bast_i2c_info); s3c24xx_fb_set_platdata(&bast_fb_info); platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices)); |