[PATCH 3/9] ARM: ux500: delete duplicate macro

Linus Walleij linus.walleij at stericsson.com
Tue Nov 6 08:15:21 EST 2012


From: Linus Walleij <linus.walleij at linaro.org>

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 at linaro.org>
---
 arch/arm/mach-ux500/board-mop500-pins.c | 4 ----
 1 file changed, 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[] = {
 	/*
-- 
1.7.11.3




More information about the linux-arm-kernel mailing list