summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-12-03 21:33:01 +0000
committerBen Dooks <ben-linux@fluff.org>2009-12-03 21:33:01 +0000
commitf18ea8276bc6b0f8584c442905e9badc2acc8785 (patch)
treef71e3f05420f35f7eaf838d93fb83d665aedcac4 /arch/arm/plat-s3c24xx
parent3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (diff)
parent1a71e4ade19d51bab03b6837d4d33a953e4e1206 (diff)
downloadblackbird-op-linux-f18ea8276bc6b0f8584c442905e9badc2acc8785.tar.gz
blackbird-op-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/plat-s3c24xx')
-rw-r--r--arch/arm/plat-s3c24xx/common-smdk.c2
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 aa119863c5ce..9e0e20ad2e46 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));
OpenPOWER on IntegriCloud