diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-10 14:27:58 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 09:55:27 +0100 |
commit | 7cb15e10365203bffc5cc75c79725b6c31aa663e (patch) | |
tree | e548e9968c70cb189cbb3ac4f292d41f46f467bc /drivers/pinctrl | |
parent | f64228ee23975d3703121a3d27dac488c3c813e9 (diff) | |
download | blackbird-op-linux-7cb15e10365203bffc5cc75c79725b6c31aa663e.tar.gz blackbird-op-linux-7cb15e10365203bffc5cc75c79725b6c31aa663e.zip |
pinctrl/nomadik: move the platform data header
This moves the platform data header for the Nomadik pin controller
to <linux/platform_data/pinctrl-nomadik.h>.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index f5c0da1f3b30..e24fa05e59b8 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -44,11 +44,11 @@ static inline u32 prcmu_read(unsigned int reg) { static inline void prcmu_write(unsigned int reg, u32 value) {} static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {} #endif +#include <linux/platform_data/pinctrl-nomadik.h> #include <asm/mach/irq.h> #include <plat/pincfg.h> -#include <plat/gpio-nomadik.h> #include "pinctrl-nomadik.h" diff --git a/drivers/pinctrl/pinctrl-nomadik.h b/drivers/pinctrl/pinctrl-nomadik.h index eef316e979a0..bcd4191e10ea 100644 --- a/drivers/pinctrl/pinctrl-nomadik.h +++ b/drivers/pinctrl/pinctrl-nomadik.h @@ -1,7 +1,7 @@ #ifndef PINCTRL_PINCTRL_NOMADIK_H #define PINCTRL_PINCTRL_NOMADIK_H -#include <plat/gpio-nomadik.h> +#include <linux/platform_data/pinctrl-nomadik.h> /* Package definitions */ #define PINCTRL_NMK_STN8815 0 |