Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index cfb6a066dfe271670fd244e1ce3472685104ec5b..92d399baaeb4508b881705b6d36473ebdddca629 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -926,7 +926,7 @@ static int mma8452_init_platform_hw(void)
 
 static struct mma8452_platform_data mma8452_info = {
   .model= 8452,
-  .swap_xy = 1,
+  .swap_xy = 0,
   .init_platform_hw= mma8452_init_platform_hw,
 
 };