diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-08-13 10:56:43 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-08-13 13:53:05 +0200 |
| commit | 651728507140246e9cf4e809f1877cb2eddbc84e (patch) | |
| tree | 9e500495fe09b0a3b611f574d3e308bde4008b70 | |
| parent | 04b13de6229621b2bd9eb1b7afaded954c3037de (diff) | |
| download | op-kernel-dev-651728507140246e9cf4e809f1877cb2eddbc84e.zip op-kernel-dev-651728507140246e9cf4e809f1877cb2eddbc84e.tar.gz | |
pinctrl/coh901: move header to platform data dir
Move the platform-specific COH901 pin control header out of the
ARM tree and down into the proper platform data include
directory.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/mach-u300/core.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-coh901.c | 2 | ||||
| -rw-r--r-- | include/linux/platform_data/pinctrl-coh901.h (renamed from arch/arm/mach-u300/include/mach/gpio-u300.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 883d5c2..0158189 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -31,6 +31,7 @@ #include <linux/pinctrl/pinconf-generic.h> #include <linux/dma-mapping.h> #include <linux/platform_data/clk-u300.h> +#include <linux/platform_data/pinctrl-coh901.h> #include <asm/types.h> #include <asm/setup.h> @@ -43,7 +44,6 @@ #include <mach/hardware.h> #include <mach/syscon.h> #include <mach/dma_channels.h> -#include <mach/gpio-u300.h> #include "spi.h" #include "i2c.h" diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 91a5dc7..b446c96 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c @@ -21,7 +21,7 @@ #include <linux/slab.h> #include <linux/pinctrl/consumer.h> #include <linux/pinctrl/pinconf-generic.h> -#include <mach/gpio-u300.h> +#include <linux/platform_data/pinctrl-coh901.h> #include "pinctrl-coh901.h" #define U300_GPIO_PORT_STRIDE (0x30) diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/include/linux/platform_data/pinctrl-coh901.h index 30dea25..30dea25 100644 --- a/arch/arm/mach-u300/include/mach/gpio-u300.h +++ b/include/linux/platform_data/pinctrl-coh901.h |
