Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / arm / mach-pxa / tosa.c

diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 1722093cfe51ac15ff976a00d1acd9d19459162e..6458f6d371d966e16399ce61c596df2835f75653 100644 (file)
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -432,6 +432,16 @@ static struct gpio_led tosa_gpio_leds[] = {
                .default_trigger        = "nand-disk",
                .gpio                   = TOSA_GPIO_NOTE_LED,
        },
+       {
+               .name                   = "tosa:dual:wlan",
+               .default_trigger        = "none",
+               .gpio                   = TOSA_GPIO_WLAN_LED,
+       },
+       {
+               .name                   = "tosa:blue:bluetooth",
+               .default_trigger        = "none",
+               .gpio                   = TOSA_GPIO_BT_LED,
+       },
 };
 
 static struct gpio_led_platform_data tosa_gpio_leds_platform_data = {