diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:33:01 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:33:01 +0000 |
| commit | f18ea8276bc6b0f8584c442905e9badc2acc8785 (patch) | |
| tree | f71e3f05420f35f7eaf838d93fb83d665aedcac4 /arch/arm/plat-s3c24xx | |
| parent | 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (diff) | |
| parent | 1a71e4ade19d51bab03b6837d4d33a953e4e1206 (diff) | |
| download | kernel_samsung_tuna-f18ea8276bc6b0f8584c442905e9badc2acc8785.zip kernel_samsung_tuna-f18ea8276bc6b0f8584c442905e9badc2acc8785.tar.gz kernel_samsung_tuna-f18ea8276bc6b0f8584c442905e9badc2acc8785.tar.bz2 | |
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/plat-s3c24xx')
| -rw-r--r-- | arch/arm/plat-s3c24xx/common-smdk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index aa11986..9e0e20a 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c @@ -198,7 +198,7 @@ void __init smdk_machine_init(void) if (machine_is_smdk2443()) smdk_nand_info.twrph0 = 50; - s3c_device_nand.dev.platform_data = &smdk_nand_info; + s3c_nand_set_platdata(&smdk_nand_info); platform_add_devices(smdk_devs, ARRAY_SIZE(smdk_devs)); |