Merge master.kernel.org:/home/rmk/linux-2.6-arm

5 files changed, 23 insertions, 16 deletions

diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index b713c44c6fb4..835d450797a1 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -41,7 +41,10 @@ extern void fp_enter(void);
  * This has a special calling convention; it doesn't
  * modify any of the usual registers, except for LR.
  */
+#define EXPORT_CRC_ALIAS(sym) __CRC_SYMBOL(sym, "")
+
 #define EXPORT_SYMBOL_ALIAS(sym,orig)           \
+ EXPORT_CRC_ALIAS(sym)                          \
  const struct kernel_symbol __ksymtab_##sym     \
   __attribute__((section("__ksymtab"))) =       \
     { (unsigned long)&orig, #sym };
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index aa92e3708838..2b544363c078 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -453,8 +453,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
         local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
 
         res[0].name = "PCI I/O Space";
-        res[0].start = 0x00001000;
-        res[0].end = 0xffff0000;
+        res[0].start = 0x00000000;
+        res[0].end = 0x0000ffff;
         res[0].flags = IORESOURCE_IO;
 
         res[1].name = "PCI Memory Space";
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index c6335f51907d..4ff4393ef0ea 100644
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -56,21 +56,24 @@ static struct resource coyote_uart_resource = {
         .flags  = IORESOURCE_MEM,
 };
 
-static struct plat_serial8250_port coyote_uart_data = {
-        .mapbase        = IXP4XX_UART2_BASE_PHYS,
-        .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-        .irq            = IRQ_IXP4XX_UART2,
-        .flags          = UPF_BOOT_AUTOCONF,
-        .iotype         = UPIO_MEM,
-        .regshift       = 2,
-        .uartclk        = IXP4XX_UART_XTAL,
+static struct plat_serial8250_port coyote_uart_data[] = {
+        {
+                .mapbase        = IXP4XX_UART2_BASE_PHYS,
+                .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
+                .irq            = IRQ_IXP4XX_UART2,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = IXP4XX_UART_XTAL,
+        },
+        { },
 };
 
 static struct platform_device coyote_uart = {
         .name           = "serial8250",
         .id             = 0,
         .dev                    = {
-                .platform_data  = &coyote_uart_data,
+                .platform_data  = coyote_uart_data,
         },
         .num_resources  = 1,
         .resource       = &coyote_uart_resource,
@@ -87,10 +90,10 @@ static void __init coyote_init(void)
         *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
 
         if (machine_is_ixdpg425()) {
-                coyote_uart_data.membase =
+                coyote_uart_data[0].membase =
                         (char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET);
-                coyote_uart_data.mapbase = IXP4XX_UART1_BASE_PHYS;
-                coyote_uart_data.irq = IRQ_IXP4XX_UART1;
+                coyote_uart_data[0].mapbase = IXP4XX_UART1_BASE_PHYS;
+                coyote_uart_data[0].irq = IRQ_IXP4XX_UART1;
         }
 
 
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index f2e9c0ea0501..c2ba759e9946 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
                 .iotype         = UPIO_MEM,
                 .regshift       = 2,
                 .uartclk        = IXP4XX_UART_XTAL,
-        }
+        },
+        { },
 };
 
 static struct platform_device ixdp425_uart = {
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index e3d8510f4340..352db98ee269 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -200,7 +200,7 @@ __v6_setup:
         mcr     p15, 0, r4, c2, c0, 1           @ load TTB1
 #ifdef CONFIG_VFP
         mrc     p15, 0, r0, c1, c0, 2
-        orr     r0, r0, #(3 << 20)
+        orr     r0, r0, #(0xf << 20)
         mcr     p15, 0, r0, c1, c0, 2           @ Enable full access to VFP
 #endif
         mrc     p15, 0, r0, c1, c0, 0           @ read control register