Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

1 files changed, 5 insertions, 38 deletions

diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
index e08c6a8ac56b..a6bdcc07f3c9 100644
--- a/arch/arm/mach-mx3/devices.c
+++ b/arch/arm/mach-mx3/devices.c
@@ -36,7 +36,7 @@ static struct resource uart0[] = {
         },
 };
 
-static struct platform_device mxc_uart_device0 = {
+struct platform_device mxc_uart_device0 = {
         .name = "imx-uart",
         .id = 0,
         .resource = uart0,
@@ -55,7 +55,7 @@ static struct resource uart1[] = {
         },
 };
 
-static struct platform_device mxc_uart_device1 = {
+struct platform_device mxc_uart_device1 = {
         .name = "imx-uart",
         .id = 1,
         .resource = uart1,
@@ -74,7 +74,7 @@ static struct resource uart2[] = {
         },
 };
 
-static struct platform_device mxc_uart_device2 = {
+struct platform_device mxc_uart_device2 = {
         .name = "imx-uart",
         .id = 2,
         .resource = uart2,
@@ -93,7 +93,7 @@ static struct resource uart3[] = {
         },
 };
 
-static struct platform_device mxc_uart_device3 = {
+struct platform_device mxc_uart_device3 = {
         .name = "imx-uart",
         .id = 3,
         .resource = uart3,
@@ -112,46 +112,13 @@ static struct resource uart4[] = {
         },
 };
 
-static struct platform_device mxc_uart_device4 = {
+struct platform_device mxc_uart_device4 = {
         .name = "imx-uart",
         .id = 4,
         .resource = uart4,
         .num_resources = ARRAY_SIZE(uart4),
 };
 
-/*
- * Register only those UARTs that physically exist
- */
-int __init imx_init_uart(int uart_no, struct imxuart_platform_data *pdata)
-{
-        switch (uart_no) {
-        case 0:
-                mxc_uart_device0.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device0);
-                break;
-        case 1:
-                mxc_uart_device1.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device1);
-                break;
-        case 2:
-                mxc_uart_device2.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device2);
-                break;
-        case 3:
-                mxc_uart_device3.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device3);
-                break;
-        case 4:
-                mxc_uart_device4.dev.platform_data = pdata;
-                platform_device_register(&mxc_uart_device4);
-                break;
-        default:
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
 /* GPIO port description */
 static struct mxc_gpio_port imx_gpio_ports[] = {
         [0] = {