diff --git a/[refs] b/[refs] index 35d39cfb40a0..08e60745754b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a61f6a55708f5e50c4d78934199e7e9257e6aa2 +refs/heads/master: df5ddf620e101f6c7f968c71b327ded16a90ca03 diff --git a/trunk/arch/x86/kernel/i8259_64.c b/trunk/arch/x86/kernel/i8259_64.c index eb72976cc13c..3f27ea0b9816 100644 --- a/trunk/arch/x86/kernel/i8259_64.c +++ b/trunk/arch/x86/kernel/i8259_64.c @@ -395,7 +395,11 @@ device_initcall(i8259A_init_sysfs); * IRQ2 is cascade interrupt to second interrupt controller */ -static struct irqaction irq2 = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL}; +static struct irqaction irq2 = { + .handler = no_action, + .mask = CPU_MASK_NONE, + .name = "cascade", +}; DEFINE_PER_CPU(vector_irq_t, vector_irq) = { [0 ... IRQ0_VECTOR - 1] = -1, [IRQ0_VECTOR] = 0,