Merge branch 'mxs/saif' into next/drivers

Conflicts:
	drivers/net/ethernet/cadence/Kconfig

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-mmp/gplugd.c
index 933420a,4665767..e266f66
--- 1/arch/arm/mach-mmp/gplugd.c
--- 2/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@@ -182,9 -182,8 +182,9 @@@ static void __init gplugd_init(void
  
        /* on-chip devices */
        pxa168_add_uart(3);
-       pxa168_add_ssp(0);
+       pxa168_add_ssp(1);
        pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info));
 +      platform_device_register(&pxa168_device_gpio);
  
        pxa168_add_eth(&gplugd_eth_platform_data);
  }

diff --cc arch/arm/mach-mmp/include/mach/gpio-pxa.h
index 9b79937,99b4ce1..0e135a5
--- 1/arch/arm/mach-mmp/include/mach/gpio-pxa.h
--- 2/arch/arm/mach-mmp/include/mach/gpio-pxa.h
+++ b/arch/arm/mach-mmp/include/mach/gpio-pxa.h
@@@ -8,8 -7,10 +8,8 @@@
  #define GPIO_REGS_VIRT        (APB_VIRT_BASE + 0x19000)
  
  #define BANK_OFF(n)   (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
- #define GPIO_REG(x)   (GPIO_REGS_VIRT + (x))
+ #define GPIO_REG(x)   (*(volatile u32 *)(GPIO_REGS_VIRT + (x)))
  
 -#define NR_BUILTIN_GPIO               IRQ_GPIO_NUM
 -
  #define gpio_to_bank(gpio)    ((gpio) >> 5)
  
  /* NOTE: these macros are defined here to make optimization of

diff --cc arch/arm/mach-pxa/balloon3.c
Simple merge

diff --cc arch/arm/mach-pxa/colibri-pxa320.c
Simple merge

diff --cc arch/arm/mach-pxa/vpac270.c
Simple merge

diff --cc drivers/net/ethernet/cadence/Kconfig
index a2e1500,b48378a..db93191
--- 1/drivers/net/ethernet/cadence/Kconfig
--- 2/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@@ -5,8 -5,9 +5,9 @@@
  config HAVE_NET_MACB
        bool
  
 -config NET_ATMEL
 -      bool "Atmel devices"
 +config NET_CADENCE
 +      bool "Cadence devices"
+       default y
        depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y.