Move the platform-specific COH901 pin control header out of the ARM tree and down into the proper platform data include directory.
Unified · Split
| @@ -31,6 +31,7 @@ · 30 unmodified lines | |||
| 31 | #include <linux/pinctrl/pinconf-generic.h> | 31 | #include <linux/pinctrl/pinconf-generic.h> |
| 32 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
| 33 | #include <linux/platform_data/clk-u300.h> | 33 | #include <linux/platform_data/clk-u300.h> |
| 34 | #include <linux/platform_data/pinctrl-coh901.h> | ||
| 34 | 35 | ||
| 35 | #include <asm/types.h> | 36 | #include <asm/types.h> |
| 36 | #include <asm/setup.h> | 37 | #include <asm/setup.h> |
| @@ -43,7 +44,6 @@ · 6 unmodified lines | |||
| 43 | #include <mach/hardware.h> | 44 | #include <mach/hardware.h> |
| 44 | #include <mach/syscon.h> | 45 | #include <mach/syscon.h> |
| 45 | #include <mach/dma_channels.h> | 46 | #include <mach/dma_channels.h> |
| 46 | #include <mach/gpio-u300.h> | ||
| 47 | 47 | ||
| 48 | #include "spi.h" | 48 | #include "spi.h" |
| 49 | #include "i2c.h" | 49 | #include "i2c.h" |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include <linux/slab.h> | 21 | #include <linux/slab.h> |
| 22 | #include <linux/pinctrl/consumer.h> | 22 | #include <linux/pinctrl/consumer.h> |
| 23 | #include <linux/pinctrl/pinconf-generic.h> | 23 | #include <linux/pinctrl/pinconf-generic.h> |
| 24 | #include <mach/gpio-u300.h> | 24 | #include <linux/platform_data/pinctrl-coh901.h> |
| 25 | #include "pinctrl-coh901.h" | 25 | #include "pinctrl-coh901.h" |
| 26 | 26 | ||
| 27 | #define U300_GPIO_PORT_STRIDE (0x30) | 27 | #define U300_GPIO_PORT_STRIDE (0x30) |
File renamed without changes.