[ARM] 4807/2: ixp4xx: Merge nslu2-power.c into nslu2-setup.c

There is no reason to have power control in a separate file from the
board setup code.  Merge it back into the board setup file, removing
superfluous header includes and removing superfluous constants from
the machine header file.

--

Signed-off-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 19 deletions

diff --git a/include/asm-arm/arch-ixp4xx/nslu2.h b/include/asm-arm/arch-ixp4xx/nslu2.h
index 850fdc5b45da..714bbc65126a 100644
--- a/include/asm-arm/arch-ixp4xx/nslu2.h
+++ b/include/asm-arm/arch-ixp4xx/nslu2.h
@@ -39,34 +39,17 @@
 
 /* Buttons */
 
-#define NSLU2_PB_GPIO           5
+#define NSLU2_PB_GPIO           5       /* power button */
 #define NSLU2_PO_GPIO           8       /* power off */
-#define NSLU2_RB_GPIO           12
-
-#define NSLU2_PB_IRQ            IRQ_IXP4XX_GPIO5
-#define NSLU2_RB_IRQ            IRQ_IXP4XX_GPIO12
-
-#define NSLU2_PB_BM             (1L << NSLU2_PB_GPIO)
-#define NSLU2_PO_BM             (1L << NSLU2_PO_GPIO)
-#define NSLU2_RB_BM             (1L << NSLU2_RB_GPIO)
+#define NSLU2_RB_GPIO           12      /* reset button */
 
 /* Buzzer */
 
 #define NSLU2_GPIO_BUZZ         4
-#define NSLU2_BZ_BM             (1L << NSLU2_GPIO_BUZZ)
 
 /* LEDs */
 
 #define NSLU2_LED_RED_GPIO      0
 #define NSLU2_LED_GRN_GPIO      1
-
-#define NSLU2_LED_RED_BM        (1L << NSLU2_LED_RED_GPIO)
-#define NSLU2_LED_GRN_BM        (1L << NSLU2_LED_GRN_GPIO)
-
 #define NSLU2_LED_DISK1_GPIO    3
 #define NSLU2_LED_DISK2_GPIO    2
-
-#define NSLU2_LED_DISK1_BM      (1L << NSLU2_LED_DISK1_GPIO)
-#define NSLU2_LED_DISK2_BM      (1L << NSLU2_LED_DISK2_GPIO)
-
-