summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-10-16 10:40:51 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-10-16 10:40:51 +0200
commit61a32b02031c20209afc6d759a2d1531e12db701 (patch)
tree40f49e6d80c373b8d6a9b6b04507709c3fe6e268 /arch/arm/mach-ux500
parentd036809d8bd9f5acebb606d5bafa2c5c22d4ae88 (diff)
downloadop-kernel-dev-61a32b02031c20209afc6d759a2d1531e12db701.zip
op-kernel-dev-61a32b02031c20209afc6d759a2d1531e12db701.tar.gz
ARM: ux500: delete duplicate macro
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>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 9c9e465..7c784f5 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -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[] = {
/*
OpenPOWER on IntegriCloud