Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / arch / arm / mach-orion5x / include / mach / orion5x.h

diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 9f5ce1ce5840845d2a6f42d2306ed0f75689d717..67bda31406dd7d540a61f1e30deb66418aeb0cf7 100644 (file)
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -134,14 +134,6 @@
 #define MPP_16_19_CTRL         ORION5X_DEV_BUS_REG(0x050)
 #define MPP_DEV_CTRL           ORION5X_DEV_BUS_REG(0x008)
 #define MPP_RESET_SAMPLE       ORION5X_DEV_BUS_REG(0x010)
-#define GPIO_OUT               ORION5X_DEV_BUS_REG(0x100)
-#define GPIO_IO_CONF           ORION5X_DEV_BUS_REG(0x104)
-#define GPIO_BLINK_EN          ORION5X_DEV_BUS_REG(0x108)
-#define GPIO_IN_POL            ORION5X_DEV_BUS_REG(0x10c)
-#define GPIO_DATA_IN           ORION5X_DEV_BUS_REG(0x110)
-#define GPIO_EDGE_CAUSE                ORION5X_DEV_BUS_REG(0x114)
-#define GPIO_EDGE_MASK         ORION5X_DEV_BUS_REG(0x118)
-#define GPIO_LEVEL_MASK                ORION5X_DEV_BUS_REG(0x11c)
 #define DEV_BANK_0_PARAM       ORION5X_DEV_BUS_REG(0x45c)
 #define DEV_BANK_1_PARAM       ORION5X_DEV_BUS_REG(0x460)
 #define DEV_BANK_2_PARAM       ORION5X_DEV_BUS_REG(0x464)
@@ -149,7 +141,6 @@
 #define DEV_BUS_CTRL           ORION5X_DEV_BUS_REG(0x4c0)
 #define DEV_BUS_INT_CAUSE      ORION5X_DEV_BUS_REG(0x4d0)
 #define DEV_BUS_INT_MASK       ORION5X_DEV_BUS_REG(0x4d4)
-#define GPIO_MAX               32
 
 /***************************************************************************
  * Orion CPU Bridge Registers