aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-09-27 23:45:47 -0400
committerBen Dooks <ben-linux@fluff.org>2009-11-30 20:34:16 -0500
commitff34aaa9535afc46b017f7a9b553dbf3e0ad5084 (patch)
tree28be46d72d77756c5625b6a86b3fc5d2311b9326
parentcf383678242eacd6f92a48314922598ed3408355 (diff)
ARM: H1940: Correct name of the local platform devices for LED and Bluetooth
The mach-h1940.c file was using s3c_device_ where it really should be calling these local definitions h1940_device to ensure they are not mistaken for real s3c_devices when the device change is done. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/mach-s3c2410/mach-h1940.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index d9cd5ddecf4a..20f3400c54ca 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -171,12 +171,12 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
171 .gpdup_mask= 0xffffffff, 171 .gpdup_mask= 0xffffffff,
172}; 172};
173 173
174static struct platform_device s3c_device_leds = { 174static struct platform_device h1940_device_leds = {
175 .name = "h1940-leds", 175 .name = "h1940-leds",
176 .id = -1, 176 .id = -1,
177}; 177};
178 178
179static struct platform_device s3c_device_bluetooth = { 179static struct platform_device h1940_device_bluetooth = {
180 .name = "h1940-bt", 180 .name = "h1940-bt",
181 .id = -1, 181 .id = -1,
182}; 182};
@@ -188,8 +188,8 @@ static struct platform_device *h1940_devices[] __initdata = {
188 &s3c_device_i2c0, 188 &s3c_device_i2c0,
189 &s3c_device_iis, 189 &s3c_device_iis,
190 &s3c_device_usbgadget, 190 &s3c_device_usbgadget,
191 &s3c_device_leds, 191 &h1940_device_leds,
192 &s3c_device_bluetooth, 192 &h1940_device_bluetooth,
193}; 193};
194 194
195static void __init h1940_map_io(void) 195static void __init h1940_map_io(void)