fix conflict for commit spi & touch screen driver

diff --cc arch/arm/mach-rk29/board-rk29sdk.c
index 5dd72399ac5f87dbf092258110be5d1fa560787e,8ba184163f5bfdf53562df454eb2684b9f258f3e..9bf9d51fc587b987d4720387c5af57217bc254b3
--- 1/arch/arm/mach-rk29/board-rk29sdk.c
--- 2/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@@ -459,11 -541,21 +543,25 @@@ static void __init rk29_board_iomux_ini
  static struct platform_device *devices[] __initdata = {\r
  #ifdef CONFIG_UART1_RK29\r
        &rk29_device_uart1,\r
 +#endif        \r
 +#ifdef CONFIG_SPIM_RK29XX\r
 +    &rk29xx_device_spi0m,\r
 +    &rk29xx_device_spi1m,\r
  #endif\r
+ \r
+ #ifdef CONFIG_I2C0_RK29\r
+       &rk29_device_i2c0,\r
+ #endif\r
+ #ifdef CONFIG_I2C1_RK29\r
+       &rk29_device_i2c1,\r
+ #endif\r
+ #ifdef CONFIG_I2C2_RK29\r
+       &rk29_device_i2c2,\r
+ #endif\r
+ #ifdef CONFIG_I2C3_RK29\r
+       &rk29_device_i2c3,\r
+ #endif\r
+ \r
  #ifdef CONFIG_SDMMC0_RK29     \r
        &rk29_device_sdmmc0,\r
  #endif\r
@@@ -684,10 -590,25 +782,27 @@@ static void __init machine_rk29_init_ir
  }\r
  \r
  static void __init machine_rk29_board_init(void)\r
 -{\r
 +{ \r
 +        rk29_board_iomux_init();\r
-       platform_add_devices(devices, ARRAY_SIZE(devices));     \r
++              platform_add_devices(devices, ARRAY_SIZE(devices));     \r
+ #ifdef CONFIG_I2C0_RK29\r
+       i2c_register_board_info(default_i2c0_data.bus_num, board_i2c0_devices,\r
+                       ARRAY_SIZE(board_i2c0_devices));\r
+ #endif\r
+ #ifdef CONFIG_I2C1_RK29\r
+       i2c_register_board_info(default_i2c1_data.bus_num, board_i2c1_devices,\r
+                       ARRAY_SIZE(board_i2c1_devices));\r
+ #endif\r
+ #ifdef CONFIG_I2C2_RK29\r
+       i2c_register_board_info(default_i2c2_data.bus_num, board_i2c2_devices,\r
+                       ARRAY_SIZE(board_i2c2_devices));\r
+ #endif\r
+ #ifdef CONFIG_I2C3_RK29\r
+       i2c_register_board_info(default_i2c3_data.bus_num, board_i2c3_devices,\r
+                       ARRAY_SIZE(board_i2c3_devices));\r
+ #endif\r
 -      platform_add_devices(devices, ARRAY_SIZE(devices));     \r
 -      rk29_board_iomux_init();\r
++\r
 +      spi_register_board_info(board_spi_devices, ARRAY_SIZE(board_spi_devices));\r
  }\r
  \r
  static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tags,\r

diff --cc arch/arm/mach-rk29/devices.c
index 6f9b03927938af293ddccaa7e23ed811b504542a,521f7c4f176f3f612379d7d494e1310f96d32320..ee664a305f84c2319efd380295be01f1e914d715
--- 1/arch/arm/mach-rk29/devices.c
--- 2/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@@ -19,10 -19,95 +19,97 @@@
  #include <linux/delay.h>
  #include <mach/irqs.h>
  #include <mach/rk29_iomap.h>
 +#include <mach/rk29-dma-pl330.h> 
  #include "devices.h"
+ #ifdef CONFIG_I2C_RK29
+ static struct resource resources_i2c0[] = {
+       {
+               .start  = IRQ_I2C0,
+               .end    = IRQ_I2C0,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = RK29_I2C0_PHYS,
+               .end    = RK29_I2C0_PHYS + SZ_4K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+ };
+ static struct resource resources_i2c1[] = {
+       {
+               .start  = IRQ_I2C1,
+               .end    = IRQ_I2C1,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = RK29_I2C1_PHYS,
+               .end    = RK29_I2C1_PHYS + SZ_4K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+ };
+ static struct resource resources_i2c2[] = {
+       {
+               .start  = IRQ_I2C2,
+               .end    = IRQ_I2C2,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = RK29_I2C2_PHYS,
+               .end    = RK29_I2C2_PHYS + SZ_4K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+ };
+ static struct resource resources_i2c3[] = {
+       {
+               .start  = IRQ_I2C3,
+               .end    = IRQ_I2C3,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .start  = RK29_I2C3_PHYS,
+               .end    = RK29_I2C3_PHYS + SZ_4K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+ };
+ 
+ struct platform_device rk29_device_i2c0 = {
+       .name   = "rk29_i2c",
+       .id     = 0,
+       .num_resources  = ARRAY_SIZE(resources_i2c0),
+       .resource       = resources_i2c0,
+       .dev                    = {
+               .platform_data = &default_i2c0_data,
+       },
+ };
+ struct platform_device rk29_device_i2c1 = {
+       .name   = "rk29_i2c",
+       .id     = 1,
+       .num_resources  = ARRAY_SIZE(resources_i2c1),
+       .resource       = resources_i2c1,
+       .dev                    = {
+               .platform_data = &default_i2c1_data,
+       },
+ };
+ struct platform_device rk29_device_i2c2 = {
+       .name   = "rk29_i2c",
+       .id     = 2,
+       .num_resources  = ARRAY_SIZE(resources_i2c2),
+       .resource       = resources_i2c2,
+       .dev                    = {
+               .platform_data = &default_i2c2_data,
+       },
+ };
+ struct platform_device rk29_device_i2c3 = {
+       .name   = "rk29_i2c",
+       .id     = 3,
+       .num_resources  = ARRAY_SIZE(resources_i2c3),
+       .resource       = resources_i2c3,
+       .dev                    = {
+               .platform_data = &default_i2c3_data,
+       },
+ };
+ #endif
  
 +
  #ifdef CONFIG_SDMMC0_RK29 
  static struct resource resources_sdmmc0[] = {
        {

diff --cc arch/arm/mach-rk29/devices.h
Simple merge

diff --cc arch/arm/mach-rk29/include/mach/board.h
Simple merge