diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 22:33:01 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 22:33:01 +0100 |
| commit | f18ea8276bc6b0f8584c442905e9badc2acc8785 (patch) | |
| tree | f71e3f05420f35f7eaf838d93fb83d665aedcac4 /arch/arm/mach-s3c2440/mach-mini2440.c | |
| parent | ARM: Merge next-s3c24xx-simtec (diff) | |
| parent | ARM: H1940: Convert h1940 bluetooth driver to rfkill (diff) | |
| download | linux-f18ea8276bc6b0f8584c442905e9badc2acc8785.tar.xz linux-f18ea8276bc6b0f8584c442905e9badc2acc8785.zip | |
ARM: Merge next-s3c24xx-dev-rtp
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk
Conflicts:
arch/arm/mach-s3c2440/mach-anubis.c
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-mini2440.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-mini2440.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c index 1c3382fefdd2..547d4fc99131 100644 --- a/arch/arm/mach-s3c2440/mach-mini2440.c +++ b/arch/arm/mach-s3c2440/mach-mini2440.c @@ -532,7 +532,6 @@ static void __init mini2440_map_io(void) s3c24xx_init_clocks(12000000); s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs)); - s3c_device_nand.dev.platform_data = &mini2440_nand_info; s3c_device_sdi.dev.platform_data = &mini2440_mmc_cfg; } @@ -677,8 +676,11 @@ static void __init mini2440_init(void) printk("\n"); s3c24xx_fb_set_platdata(&mini2440_fb_info); } + s3c24xx_udc_set_platdata(&mini2440_udc_cfg); + s3c_nand_set_platdata(&mini2440_nand_info); s3c_i2c0_set_platdata(NULL); + i2c_register_board_info(0, mini2440_i2c_devs, ARRAY_SIZE(mini2440_i2c_devs)); |