]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: ux500: delete duplicate macro
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 16 Oct 2012 08:40:51 +0000 (10:40 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 16 Oct 2012 08:40:51 +0000 (10:40 +0200)
Some merge mishap has caused the DB8500_PIN_SLEEP() macro to
appear twice. Get rid of the suplus copy.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
arch/arm/mach-ux500/board-mop500-pins.c

index 9c9e4658023460ab88ca58753abaf4a8d2b34b66..7c784f54a20131259ec1e47bb6fcd92a12182273 100644 (file)
@@ -77,10 +77,6 @@ BIAS(slpm_in_nopull_wkup_pdis, PIN_SLEEPMODE_ENABLED|PIN_SLPM_INPUT_NOPULL|PIN_S
        PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \
                            pin, conf)
 
-#define DB8500_PIN_SLEEP(pin,conf,dev) \
-       PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \
-                           pin, conf)
-
 /* Pin control settings */
 static struct pinctrl_map __initdata mop500_family_pinmap[] = {
        /*