Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 7 deletions

diff --git a/arch/mips/alchemy/common/gpiolib-au1000.c b/arch/mips/alchemy/common/gpiolib-au1000.c
index 1bfa91f939f4..c8e1a94d4a95 100644
--- a/arch/mips/alchemy/common/gpiolib-au1000.c
+++ b/arch/mips/alchemy/common/gpiolib-au1000.c
@@ -36,7 +36,6 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/gpio.h>
 
-#if !defined(CONFIG_SOC_AU1000)
 static int gpio2_get(struct gpio_chip *chip, unsigned offset)
 {
         return alchemy_gpio2_get_value(offset + ALCHEMY_GPIO2_BASE);
@@ -63,7 +62,7 @@ static int gpio2_to_irq(struct gpio_chip *chip, unsigned offset)
 {
         return alchemy_gpio2_to_irq(offset + ALCHEMY_GPIO2_BASE);
 }
-#endif /* !defined(CONFIG_SOC_AU1000) */
+
 
 static int gpio1_get(struct gpio_chip *chip, unsigned offset)
 {
@@ -104,7 +103,6 @@ struct gpio_chip alchemy_gpio_chip[] = {
                 .base                   = ALCHEMY_GPIO1_BASE,
                 .ngpio                  = ALCHEMY_GPIO1_NUM,
         },
-#if !defined(CONFIG_SOC_AU1000)
         [1] = {
                 .label                  = "alchemy-gpio2",
                 .direction_input        = gpio2_direction_input,
@@ -115,15 +113,13 @@ struct gpio_chip alchemy_gpio_chip[] = {
                 .base                   = ALCHEMY_GPIO2_BASE,
                 .ngpio                  = ALCHEMY_GPIO2_NUM,
         },
-#endif
 };
 
 static int __init alchemy_gpiolib_init(void)
 {
         gpiochip_add(&alchemy_gpio_chip[0]);
-#if !defined(CONFIG_SOC_AU1000)
-        gpiochip_add(&alchemy_gpio_chip[1]);
-#endif
+        if (alchemy_get_cputype() != ALCHEMY_CPU_AU1000)
+                gpiochip_add(&alchemy_gpio_chip[1]);
 
         return 0;
 }