3 files changed, 21 insertions, 21 deletions
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",
+        .typename = "none",
-        startup_none,
+        .startup = startup_none,
-        shutdown_none,
+        .shutdown = shutdown_none,
-        enable_none,
+        .enable = enable_none,
-        disable_none,
+        .disable = disable_none,
-        ack_none,
+        .ack = ack_none,
-        end_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",
+        .typename = "NMI",
-        irq_zero,               /* startup */
+        .startup = irq_zero,            /* startup */
-        irq_nop,                /* shutdown */
+        .shutdown = irq_nop,            /* shutdown */
-        irq_nop,                /* enable */
+        .enable = irq_nop,              /* enable */
-        irq_nop,                /* disable */
+        .disable = irq_nop,             /* disable */
-        irq_nop,                /* ack */
+        .ack = irq_nop,         /* ack */
-        nmi_end,                /* end */
+        .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",
+        .typename = "IRQ",
-        irq_zero,               /* startup */
+        .startup = irq_zero,            /* startup */
-        irq_nop,                /* shutdown */
+        .shutdown = irq_nop,            /* shutdown */
-        irq_nop,                /* enable */
+        .enable = irq_nop,              /* enable */
-        irq_nop,                /* disable */
+        .disable = irq_nop,             /* disable */
-        irq_nop,                /* ack */
+        .ack = irq_nop,         /* ack */
-        irq_nop,                /* end */
+        .end = irq_nop,         /* end */
 };
 void __init mach_init_irqs (void)

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)
67	#define end_none enable_none	67	#define end_none enable_none
68		68
69	struct hw_interrupt_type no_irq_type = {	69	struct hw_interrupt_type no_irq_type = {
70	"none",	70	.typename = "none",
71	startup_none,	71	.startup = startup_none,
72	shutdown_none,	72	.shutdown = shutdown_none,
73	enable_none,	73	.enable = enable_none,
74	disable_none,	74	.disable = disable_none,
75	ack_none,	75	.ack = ack_none,
76	end_none	76	.end = end_none
77	};	77	};
78		78
79	volatile unsigned long irq_err_count, spurious_count;	79	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)
138	}	138	}
139		139
140	static struct hw_interrupt_type nmi_irq_type = {	140	static struct hw_interrupt_type nmi_irq_type = {
141	"NMI",	141	.typename = "NMI",
142	irq_zero, /* startup */	142	.startup = irq_zero, /* startup */
143	irq_nop, /* shutdown */	143	.shutdown = irq_nop, /* shutdown */
144	irq_nop, /* enable */	144	.enable = irq_nop, /* enable */
145	irq_nop, /* disable */	145	.disable = irq_nop, /* disable */
146	irq_nop, /* ack */	146	.ack = irq_nop, /* ack */
147	nmi_end, /* end */	147	.end = nmi_end, /* end */
148	};	148	};
149		149
150	void __init init_IRQ (void)	150	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) { }
73	static unsigned irq_zero (unsigned irq) { return 0; }	73	static unsigned irq_zero (unsigned irq) { return 0; }
74		74
75	static struct hw_interrupt_type sim_irq_type = {	75	static struct hw_interrupt_type sim_irq_type = {
76	"IRQ",	76	.typename = "IRQ",
77	irq_zero, /* startup */	77	.startup = irq_zero, /* startup */
78	irq_nop, /* shutdown */	78	.shutdown = irq_nop, /* shutdown */
79	irq_nop, /* enable */	79	.enable = irq_nop, /* enable */
80	irq_nop, /* disable */	80	.disable = irq_nop, /* disable */
81	irq_nop, /* ack */	81	.ack = irq_nop, /* ack */
82	irq_nop, /* end */	82	.end = irq_nop, /* end */
83	};	83	};
84		84
85	void __init mach_init_irqs (void)	85	void __init mach_init_irqs (void)