Merge /spare/repo/linux-2.6/

5 files changed, 22 insertions, 22 deletions

diff --git a/arch/v850/kernel/asm-consts.c b/arch/v850/kernel/asm-offsets.c
index 24f291369070..24f291369070 100644
--- a/arch/v850/kernel/asm-consts.c
+++ b/arch/v850/kernel/asm-offsets.c
diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S
index 895e27b1d839..d991e4547dbb 100644
--- a/arch/v850/kernel/entry.S
+++ b/arch/v850/kernel/entry.S
@@ -22,7 +22,7 @@
 #include <asm/irq.h>
 #include <asm/errno.h>
 
-#include <asm/asm-consts.h>
+#include <asm/asm-offsets.h>
 
 
 /* Make a slightly more convenient alias for C_SYMBOL_NAME.  */
diff --git a/arch/v850/kernel/irq.c b/arch/v850/kernel/irq.c
index 336cbf21dc8f..9e85969ba976 100644
--- a/arch/v850/kernel/irq.c
+++ b/arch/v850/kernel/irq.c
@@ -67,13 +67,13 @@ static void ack_none(unsigned int irq)
 #define end_none        enable_none
 
 struct hw_interrupt_type no_irq_type = {
-        "none",
-        startup_none,
-        shutdown_none,
-        enable_none,
-        disable_none,
-        ack_none,
-        end_none
+        .typename = "none",
+        .startup = startup_none,
+        .shutdown = shutdown_none,
+        .enable = enable_none,
+        .disable = disable_none,
+        .ack = ack_none,
+        .end = end_none
 };
 
 volatile unsigned long irq_err_count, spurious_count;
diff --git a/arch/v850/kernel/setup.c b/arch/v850/kernel/setup.c
index abd48409dcca..62bdb8d29fc0 100644
--- a/arch/v850/kernel/setup.c
+++ b/arch/v850/kernel/setup.c
@@ -138,13 +138,13 @@ static void nmi_end (unsigned irq)
 }
 
 static struct hw_interrupt_type nmi_irq_type = {
-        "NMI",
-        irq_zero,               /* startup */
-        irq_nop,                /* shutdown */
-        irq_nop,                /* enable */
-        irq_nop,                /* disable */
-        irq_nop,                /* ack */
-        nmi_end,                /* end */
+        .typename = "NMI",
+        .startup = irq_zero,            /* startup */
+        .shutdown = irq_nop,            /* shutdown */
+        .enable = irq_nop,              /* enable */
+        .disable = irq_nop,             /* disable */
+        .ack = irq_nop,         /* ack */
+        .end = nmi_end,         /* end */
 };
 
 void __init init_IRQ (void)
diff --git a/arch/v850/kernel/sim.c b/arch/v850/kernel/sim.c
index e2cc5580fa2a..17049aaa8f11 100644
--- a/arch/v850/kernel/sim.c
+++ b/arch/v850/kernel/sim.c
@@ -73,13 +73,13 @@ static void irq_nop (unsigned irq) { }
 static unsigned irq_zero (unsigned irq) { return 0; }
 
 static struct hw_interrupt_type sim_irq_type = {
-        "IRQ",
-        irq_zero,               /* startup */
-        irq_nop,                /* shutdown */
-        irq_nop,                /* enable */
-        irq_nop,                /* disable */
-        irq_nop,                /* ack */
-        irq_nop,                /* end */
+        .typename = "IRQ",
+        .startup = irq_zero,            /* startup */
+        .shutdown = irq_nop,            /* shutdown */
+        .enable = irq_nop,              /* enable */
+        .disable = irq_nop,             /* disable */
+        .ack = irq_nop,         /* ack */
+        .end = irq_nop,         /* end */
 };
 
 void __init mach_init_irqs (void)