summaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c24xx/s3c244x.c
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-07-15 01:29:34 +0400
committerJonathan Corbet <corbet@lwn.net>2008-07-15 01:29:34 +0400
commit2fceef397f9880b212a74c418290ce69e7ac00eb (patch)
treed9cc09ab992825ef7fede4a688103503e3caf655 /arch/arm/plat-s3c24xx/s3c244x.c
parentfeae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff)
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff)
downloadlinux-2fceef397f9880b212a74c418290ce69e7ac00eb.tar.xz
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c244x.c')
-rw-r--r--arch/arm/plat-s3c24xx/s3c244x.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c
index f197bb3a2366..2f01af5f64c4 100644
--- a/arch/arm/plat-s3c24xx/s3c244x.c
+++ b/arch/arm/plat-s3c24xx/s3c244x.c
@@ -65,6 +65,7 @@ void __init s3c244x_map_io(struct map_desc *mach_desc, int size)
/* rename any peripherals used differing from the s3c2410 */
+ s3c_device_sdi.name = "s3c2440-sdi";
s3c_device_i2c.name = "s3c2440-i2c";
s3c_device_nand.name = "s3c2440-nand";
s3c_device_usbgadget.name = "s3c2440-usbgadget";