diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 13:13:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 13:13:45 -0700 |
| commit | b1618547bb68bd32a8b5ed20f97fa577d16b6801 (patch) | |
| tree | 3a44c72206d5b9297e177c38f5c8d9ee68e901ed /Documentation | |
| parent | 0b177ab53d0a2303ba287ec8babfd6e1de801500 (diff) | |
| parent | e3a66aa33a8f06924f67770e15c22a5c52df314e (diff) | |
| download | op-kernel-dev-b1618547bb68bd32a8b5ed20f97fa577d16b6801.zip op-kernel-dev-b1618547bb68bd32a8b5ed20f97fa577d16b6801.tar.gz | |
Merge branch 'next/multiplatform' into late/kirkwood
By Arnd Bergmann (15) and David Brown (1)
* next/multiplatform:
ARM: msm: Move core.h contents into common.h
ARM: spear: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/spi/ep93xx_spi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/spi/ep93xx_spi b/Documentation/spi/ep93xx_spi index d8eb01c..832ddce 100644 --- a/Documentation/spi/ep93xx_spi +++ b/Documentation/spi/ep93xx_spi @@ -26,7 +26,7 @@ arch/arm/mach-ep93xx/ts72xx.c: #include <linux/gpio.h> #include <linux/spi/spi.h> -#include <mach/ep93xx_spi.h> +#include <linux/platform_data/spi-ep93xx.h> /* this is our GPIO line used for chip select */ #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9 |
