Merge ../linux-2.6 by hand

3 files changed, 15 insertions, 19 deletions

diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c
index dea48b3ad687..bd885785e2f9 100644
--- a/arch/mips/momentum/ocelot_c/cpci-irq.c
+++ b/arch/mips/momentum/ocelot_c/cpci-irq.c
@@ -129,14 +129,13 @@ void ll_cpci_irq(struct pt_regs *regs)
 #define shutdown_cpci_irq       disable_cpci_irq
 
 struct hw_interrupt_type cpci_irq_type = {
-        "CPCI/FPGA",
-        startup_cpci_irq,
-        shutdown_cpci_irq,
-        enable_cpci_irq,
-        disable_cpci_irq,
-        mask_and_ack_cpci_irq,
-        end_cpci_irq,
-        NULL
+        .typename = "CPCI/FPGA",
+        .startup = startup_cpci_irq,
+        .shutdown = shutdown_cpci_irq,
+        .enable = enable_cpci_irq,
+        .disable = disable_cpci_irq,
+        .ack = mask_and_ack_cpci_irq,
+        .end = end_cpci_irq,
 };
 
 void cpci_irq_init(void)
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
index 844ddd06349b..ce70fc96f160 100644
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ b/arch/mips/momentum/ocelot_c/setup.c
@@ -222,7 +222,7 @@ void momenco_time_init(void)
         rtc_set_time = m48t37y_set_time;
 }
 
-static void __init momenco_ocelot_c_setup(void)
+void __init plat_setup(void)
 {
         unsigned int tmpword;
 
@@ -340,8 +340,6 @@ static void __init momenco_ocelot_c_setup(void)
         }
 }
 
-early_initcall(momenco_ocelot_c_setup);
-
 #ifndef CONFIG_64BIT
 /* This needs to be one of the first initcalls, because no I/O port access
    can work before this */
diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c
index ebe1507b17df..755bde5146be 100644
--- a/arch/mips/momentum/ocelot_c/uart-irq.c
+++ b/arch/mips/momentum/ocelot_c/uart-irq.c
@@ -122,14 +122,13 @@ void ll_uart_irq(struct pt_regs *regs)
 #define shutdown_uart_irq       disable_uart_irq
 
 struct hw_interrupt_type uart_irq_type = {
-        "UART/FPGA",
-        startup_uart_irq,
-        shutdown_uart_irq,
-        enable_uart_irq,
-        disable_uart_irq,
-        mask_and_ack_uart_irq,
-        end_uart_irq,
-        NULL
+        .typename = "UART/FPGA",
+        .startup = startup_uart_irq,
+        .shutdown = shutdown_uart_irq,
+        .enable = enable_uart_irq,
+        .disable = disable_uart_irq,
+        .ack = mask_and_ack_uart_irq,
+        .end = end_uart_irq,
 };
 
 void uart_irq_init(void)