From ff34aaa9535afc46b017f7a9b553dbf3e0ad5084 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 28 Sep 2009 12:45:47 +0900 Subject: [PATCH] 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 --- arch/arm/mach-s3c2410/mach-h1940.c | 8 ++++---- 1 file 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 = { .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) -- 2.30.2