diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-10 14:35:17 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 09:55:29 +0100 |
| commit | c3123cfdc9e3241055f1ba0d6ceb8b41f97e31b9 (patch) | |
| tree | 9ba3caa2760a6415210d9e514b3aa61bc21a7a34 /drivers/pinctrl | |
| parent | 7cb15e10365203bffc5cc75c79725b6c31aa663e (diff) | |
| download | linux-c3123cfdc9e3241055f1ba0d6ceb8b41f97e31b9.tar.gz linux-c3123cfdc9e3241055f1ba0d6ceb8b41f97e31b9.tar.bz2 linux-c3123cfdc9e3241055f1ba0d6ceb8b41f97e31b9.zip | |
pinctrl/nomadik: merge old pincfg header
This merges the old <plat/pincfg.h> header into
<linux/platform_data/pinctrl-nomadik.h> and rids us of
yet one more <plat/*> include.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index e24fa05e59b8..a49052305756 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -48,8 +48,6 @@ static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {} #include <asm/mach/irq.h> -#include <plat/pincfg.h> - #include "pinctrl-nomadik.h" /* @@ -534,7 +532,7 @@ static int __nmk_config_pins(pin_cfg_t *cfgs, int num, bool sleep) * and its sleep mode based on the specified configuration. The @cfg is * usually one of the SoC specific macros defined in mach/<soc>-pins.h. These * are constructed using, and can be further enhanced with, the macros in - * plat/pincfg.h. + * <linux/platform_data/pinctrl-nomadik.h> * * If a pin's mode is set to GPIO, it is configured as an input to avoid * side-effects. The gpio can be manipulated later using standard GPIO API |