diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-05 05:17:25 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-05 05:17:25 +0200 |
| commit | 54d69df5849ec2e660aa12ac75562618c10fb499 (patch) | |
| tree | adbfb8bcc7cc73b83bf2b784fa331911ba03573a /drivers/spi/spi-nuc900.c | |
| parent | Merge tag 'omap-devel-late-for-v3.7' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ARM: mvebu: fix build breaks from multi-platform conversion (diff) | |
| download | linux-54d69df5849ec2e660aa12ac75562618c10fb499.tar.xz linux-54d69df5849ec2e660aa12ac75562618c10fb499.zip | |
Merge branch 'late/kirkwood' into late/soc
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.
Final contents described in shared tag.
Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/spi/spi-nuc900.c')
| -rw-r--r-- | drivers/spi/spi-nuc900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c index dae8be229c5d..a6eca6ffdabe 100644 --- a/drivers/spi/spi-nuc900.c +++ b/drivers/spi/spi-nuc900.c @@ -26,7 +26,7 @@ #include <linux/spi/spi.h> #include <linux/spi/spi_bitbang.h> -#include <mach/nuc900_spi.h> +#include <linux/platform_data/spi-nuc900.h> /* usi registers offset */ #define USI_CNT 0x00 |