diff options
Diffstat (limited to 'arch/v850/kernel')
-rw-r--r-- | arch/v850/kernel/fpga85e2c.c | 5 | ||||
-rw-r--r-- | arch/v850/kernel/time.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/arch/v850/kernel/fpga85e2c.c b/arch/v850/kernel/fpga85e2c.c index 5c4923558a75..ab9cf16a85c8 100644 --- a/arch/v850/kernel/fpga85e2c.c +++ b/arch/v850/kernel/fpga85e2c.c | |||
@@ -160,5 +160,8 @@ static void make_reg_snap (int irq, void *dummy, struct pt_regs *regs) | |||
160 | 160 | ||
161 | static int reg_snap_dev_id; | 161 | static int reg_snap_dev_id; |
162 | static struct irqaction reg_snap_action = { | 162 | static struct irqaction reg_snap_action = { |
163 | make_reg_snap, 0, CPU_MASK_NONE, "reg_snap", ®_snap_dev_id, 0 | 163 | .handler = make_reg_snap, |
164 | .mask = CPU_MASK_NONE, | ||
165 | .name = "reg_snap", | ||
166 | .dev_id = ®_snap_dev_id, | ||
164 | }; | 167 | }; |
diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c index f0905b03523b..d810c93fe665 100644 --- a/arch/v850/kernel/time.c +++ b/arch/v850/kernel/time.c | |||
@@ -92,12 +92,11 @@ static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs) | |||
92 | 92 | ||
93 | static int timer_dev_id; | 93 | static int timer_dev_id; |
94 | static struct irqaction timer_irqaction = { | 94 | static struct irqaction timer_irqaction = { |
95 | timer_interrupt, | 95 | .handler = timer_interrupt, |
96 | IRQF_DISABLED, | 96 | .flags = IRQF_DISABLED, |
97 | CPU_MASK_NONE, | 97 | .mask = CPU_MASK_NONE, |
98 | "timer", | 98 | .name = "timer", |
99 | &timer_dev_id, | 99 | .dev_id = &timer_dev_id, |
100 | NULL | ||
101 | }; | 100 | }; |
102 | 101 | ||
103 | void time_init (void) | 102 | void time_init (void) |