aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-11-03 01:00:02 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-11-03 01:00:02 +0100
commit1c52a65040ed7007ed7dbe9bd1e2709996c61890 (patch)
tree9a9d3fed7acec4ee80b1315125506c30be696c57 /arch
parent4908c7da3a111397a50f1beed67bd4bdbd377d90 (diff)
parentab57513025ff206dde575ec3e356231b0e71a37c (diff)
Merge branch 'gta02-machine-2.6.31' into om-gta02-2.6.31
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index d367b6f7e5d..eed207a5956 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -799,15 +799,15 @@ static struct platform_device gta02_buttons_device = {
/* LEDs */
static struct gpio_led gta02_gpio_leds[] = {
{
- .name = "gta02-power:orange",
+ .name = "gta02:orange:power",
.gpio = GTA02_GPIO_PWR_LED1,
},
{
- .name = "gta02-power:blue",
+ .name = "gta02:blue:power",
.gpio = GTA02_GPIO_PWR_LED2,
},
{
- .name = "gta02-aux:red",
+ .name = "gta02:red:aux",
.gpio = GTA02_GPIO_AUX_LED,
},
};