summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-09-28 12:45:47 +0900
committerBen Dooks <ben-linux@fluff.org>2009-12-01 01:34:16 +0000
commitff34aaa9535afc46b017f7a9b553dbf3e0ad5084 (patch)
tree28be46d72d77756c5625b6a86b3fc5d2311b9326 /arch/arm/mach-s3c2410
parentcf383678242eacd6f92a48314922598ed3408355 (diff)
downloadop-kernel-dev-ff34aaa9535afc46b017f7a9b553dbf3e0ad5084.zip
op-kernel-dev-ff34aaa9535afc46b017f7a9b553dbf3e0ad5084.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-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 d9cd5dd..20f3400 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 = {
.gpdup_mask= 0xffffffff,
};
-static struct platform_device s3c_device_leds = {
+static struct platform_device h1940_device_leds = {
.name = "h1940-leds",
.id = -1,
};
-static struct platform_device s3c_device_bluetooth = {
+static struct platform_device h1940_device_bluetooth = {
.name = "h1940-bt",
.id = -1,
};
@@ -188,8 +188,8 @@ static struct platform_device *h1940_devices[] __initdata = {
&s3c_device_i2c0,
&s3c_device_iis,
&s3c_device_usbgadget,
- &s3c_device_leds,
- &s3c_device_bluetooth,
+ &h1940_device_leds,
+ &h1940_device_bluetooth,
};
static void __init h1940_map_io(void)
OpenPOWER on IntegriCloud