diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 16:18:00 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 16:18:00 +0000 |
commit | bbcb953ec40bba420958ab0de5b97802c0019068 (patch) | |
tree | 70e813610a2b7a56b8a58f762acb6a0d59ed0760 /arch/arm/plat-s3c24xx/s3c244x.c | |
parent | 993b3574d79f84ecb61e6fc6f134de95876ef81c (diff) | |
parent | 54f677944dcf6df99030ca4797aaf3023c728f26 (diff) |
Merge branch 'rmk-unreviewed' into s3c64xx
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c244x.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/s3c244x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index 49436840305..c1de6bb0101 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c @@ -68,7 +68,7 @@ void __init s3c244x_map_io(void) /* rename any peripherals used differing from the s3c2410 */ s3c_device_sdi.name = "s3c2440-sdi"; - s3c_device_i2c.name = "s3c2440-i2c"; + s3c_device_i2c0.name = "s3c2440-i2c"; s3c_device_nand.name = "s3c2440-nand"; s3c_device_usbgadget.name = "s3c2440-usbgadget"; } |