From 3943d67f318e2505bd29e149ea569ef1b67e1999 Mon Sep 17 00:00:00 2001
From: Mike Dunn <mikedunn@newsguy.com>
Date: Thu, 27 Dec 2012 10:02:18 -0800
Subject: [PATCH] --- yaml --- r: 355100 b: refs/heads/master c:
 6a639bb83b751bfed61be13c0e3df17e5a970a94 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-pxa/include/mach/palmtreo.h | 2 --
 trunk/arch/arm/mach-pxa/palmtreo.c              | 9 ++-------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 55adceef706f..f7212c1279ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c33727a62ac07eed3ae423c209f549394c5c4e9
+refs/heads/master: 6a639bb83b751bfed61be13c0e3df17e5a970a94
diff --git a/trunk/arch/arm/mach-pxa/include/mach/palmtreo.h b/trunk/arch/arm/mach-pxa/include/mach/palmtreo.h
index 32661945d4c3..714b6574393e 100644
--- a/trunk/arch/arm/mach-pxa/include/mach/palmtreo.h
+++ b/trunk/arch/arm/mach-pxa/include/mach/palmtreo.h
@@ -38,7 +38,6 @@
 #define GPIO_NR_TREO_LCD_POWER	25
 
 /* Treo680 specific GPIOs */
-#ifdef CONFIG_MACH_TREO680
 #define GPIO_NR_TREO680_SD_READONLY	33
 #define GPIO_NR_TREO680_SD_POWER	42
 #define GPIO_NR_TREO680_VIBRATE_EN	44
@@ -47,7 +46,6 @@
 #define GPIO_NR_TREO680_LCD_POWER	77
 #define GPIO_NR_TREO680_LCD_EN		86
 #define GPIO_NR_TREO680_LCD_EN_N	25
-#endif /* CONFIG_MACH_TREO680 */
 
 /* Centro685 specific GPIOs */
 #define GPIO_NR_CENTRO_SD_POWER		21
diff --git a/trunk/arch/arm/mach-pxa/palmtreo.c b/trunk/arch/arm/mach-pxa/palmtreo.c
index 44412162fd27..577512845a6c 100644
--- a/trunk/arch/arm/mach-pxa/palmtreo.c
+++ b/trunk/arch/arm/mach-pxa/palmtreo.c
@@ -334,7 +334,6 @@ static inline void palmtreo_uhc_init(void) {}
 /******************************************************************************
  * Vibra and LEDs
  ******************************************************************************/
-#ifdef CONFIG_MACH_TREO680
 static struct gpio_led treo680_gpio_leds[] = {
 	{
 		.name			= "treo680:vibra:vibra",
@@ -385,21 +384,17 @@ static struct gpio_led_platform_data centro_gpio_led_info = {
 static struct platform_device palmtreo_leds = {
 	.name   = "leds-gpio",
 	.id     = -1,
-	.dev    = {
-		.platform_data  = &treo680_gpio_led_info,
-	}
 };
 
 static void __init palmtreo_leds_init(void)
 {
 	if (machine_is_centro())
 		palmtreo_leds.dev.platform_data = &centro_gpio_led_info;
+	else if (machine_is_treo680())
+		palmtreo_leds.dev.platform_data = &treo680_gpio_led_info;
 
 	platform_device_register(&palmtreo_leds);
 }
-#else
-static inline void palmtreo_leds_init(void) {}
-#endif
 
 /******************************************************************************
  * Machine init