Merge branch 'spi-mcspi' into spi-next

2012-11-14 12:16:50 +09:00
parent 8266bdd2d7 2cd451792d
commit 170c2d0a87
3 changed files with 8 additions and 8 deletions
--- 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;