diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-09-10 21:49:04 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-09-10 21:49:04 +0400 |
| commit | 83be0edd42545894605a50f27a151a928c323177 (patch) | |
| tree | 6a1f0ae7e3ec5e672a2c728b934212ebfe53c287 /Documentation | |
| parent | 18ce26ffdd865650fd95b80ff0283c9220d21895 (diff) | |
| parent | ee6f08d58e6216df1d72ebf569ae6f93f2e3a930 (diff) | |
Automatically merging tracking-multiplatform into merge-linux-linaro-core-tracking
Conflicting files:
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 d8eb01c15db..f088b4b209d 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 <mach-ep93xx/ep93xx_spi.h> /* this is our GPIO line used for chip select */ #define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9 |