diff options
| author | Mark Brown | 2012-11-14 04:16:50 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-11-14 04:16:50 +0100 |
| commit | 170c2d0a87922adb43a8e8ca47cba3e30407d4d6 (patch) | |
| tree | 1e2d95a01484072e00bfa3267636e1d7836bcbd6 /include | |
| parent | Merge branch 'spi-tegra' into spi-next (diff) | |
| parent | spi/omap: fix D0/D1 direction confusion (diff) | |
| download | kernel-qcow2-linux-170c2d0a87922adb43a8e8ca47cba3e30407d4d6.tar.gz kernel-qcow2-linux-170c2d0a87922adb43a8e8ca47cba3e30407d4d6.tar.xz kernel-qcow2-linux-170c2d0a87922adb43a8e8ca47cba3e30407d4d6.zip | |
Merge branch 'spi-mcspi' into spi-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/spi-omap2-mcspi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h index ce70f7b5a8e1..a65572d53211 100644 --- a/include/linux/platform_data/spi-omap2-mcspi.h +++ b/include/linux/platform_data/spi-omap2-mcspi.h @@ -7,8 +7,8 @@ #define OMAP4_MCSPI_REG_OFFSET 0x100 -#define MCSPI_PINDIR_D0_OUT_D1_IN 0 -#define MCSPI_PINDIR_D0_IN_D1_OUT 1 +#define MCSPI_PINDIR_D0_IN_D1_OUT 0 +#define MCSPI_PINDIR_D0_OUT_D1_IN 1 struct omap2_mcspi_platform_config { unsigned short num_cs; |