diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-16 04:40:51 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-10-16 04:40:51 -0400 |
| commit | 61a32b02031c20209afc6d759a2d1531e12db701 (patch) | |
| tree | 40f49e6d80c373b8d6a9b6b04507709c3fe6e268 /arch/arm | |
| parent | d036809d8bd9f5acebb606d5bafa2c5c22d4ae88 (diff) | |
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')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 4 |
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 9c9e46580234..7c784f54a201 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 | |||
| 77 | PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \ | 77 | PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \ |
| 78 | pin, conf) | 78 | pin, conf) |
| 79 | 79 | ||
| 80 | #define DB8500_PIN_SLEEP(pin,conf,dev) \ | ||
| 81 | PIN_MAP_CONFIGS_PIN(dev, PINCTRL_STATE_SLEEP, "pinctrl-db8500", \ | ||
| 82 | pin, conf) | ||
| 83 | |||
| 84 | /* Pin control settings */ | 80 | /* Pin control settings */ |
| 85 | static struct pinctrl_map __initdata mop500_family_pinmap[] = { | 81 | static struct pinctrl_map __initdata mop500_family_pinmap[] = { |
| 86 | /* | 82 | /* |