diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-01 17:47:06 +0200 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-07-31 01:10:24 +0200 |
commit | 14077ea63b5aea1db0142c1085d24aa0d11b9d36 (patch) | |
tree | 110e40969a8cde0f3b1dd3da3bb553091412ed36 /arch/arm/mach-s3c6410 | |
parent | S3C64XX: Fix ARMCLK configuration (diff) | |
download | linux-14077ea63b5aea1db0142c1085d24aa0d11b9d36.tar.xz linux-14077ea63b5aea1db0142c1085d24aa0d11b9d36.zip |
ARM: S3C: move s3c_device_nand from plat-s3c24xx to plat-s3c
Move the s3c_device_nand platform device from plat-s3c24xx to plat-s3c,
now that the nand driver also support the s3c64xx devices.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c6410')
-rw-r--r-- | arch/arm/mach-s3c6410/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/cpu.c b/arch/arm/mach-s3c6410/cpu.c index ade904de8895..9b67c663d9d8 100644 --- a/arch/arm/mach-s3c6410/cpu.c +++ b/arch/arm/mach-s3c6410/cpu.c @@ -62,6 +62,8 @@ void __init s3c6410_map_io(void) /* the i2c devices are directly compatible with s3c2440 */ s3c_i2c0_setname("s3c2440-i2c"); s3c_i2c1_setname("s3c2440-i2c"); + + s3c_device_nand.name = "s3c6400-nand"; } void __init s3c6410_init_clocks(int xtal) |