ARM: OMAP1: ams-delta: Move AMS_DELTA_LATCH2_NGPIO to the board file

That symbol is not used outside the board file, there is no need to
keep it in the board header.

Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index a6986a83a916cd90c329b4c02b47c3ddc6b614f7..1947bc63074eaa2b17162863e2b39786287c4fd6 100644 (file)
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -204,11 +204,13 @@ static struct platform_device latch1_gpio_device = {
 #define LATCH1_PIN_DOCKIT1             6
 #define LATCH1_PIN_DOCKIT2             7
 
+#define LATCH2_NGPIO                   16
+
 static struct resource latch2_resources[] = {
        [0] = {
                .name   = "dat",
                .start  = LATCH2_PHYS,
-               .end    = LATCH2_PHYS + (AMS_DELTA_LATCH2_NGPIO - 1) / 8,
+               .end    = LATCH2_PHYS + (LATCH2_NGPIO - 1) / 8,
                .flags  = IORESOURCE_MEM,
        },
 };
@@ -217,7 +219,7 @@ static struct resource latch2_resources[] = {
 
 static struct bgpio_pdata latch2_pdata = {
        .label  = LATCH2_LABEL,
-       .ngpio  = AMS_DELTA_LATCH2_NGPIO,
+       .ngpio  = LATCH2_NGPIO,
 };
 
 static struct platform_device latch2_gpio_device = {

diff --git a/arch/arm/mach-omap1/board-ams-delta.h b/arch/arm/mach-omap1/board-ams-delta.h
index 2c3aff824cf04b9b7ba33af9568d8b3d9916e1ae..b5c4a373b90528be13e183bfeeef74440ae046ac 100644 (file)
--- a/arch/arm/mach-omap1/board-ams-delta.h
+++ b/arch/arm/mach-omap1/board-ams-delta.h
@@ -37,8 +37,6 @@
 #define AMS_DELTA_GPIO_PIN_CONFIG      11
 #define AMS_DELTA_GPIO_PIN_NAND_RB     12
 
-#define AMS_DELTA_LATCH2_NGPIO         16
-
 #endif /* CONFIG_MACH_AMS_DELTA */
 
 #endif /* __ASM_ARCH_OMAP_AMS_DELTA_H */