Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel

This commit is contained in:
Russell King
2009-06-10 22:40:55 +01:00
committad av Russell King
förälder b0efb42478 99ae99533a
incheckning 547c32aeb5
118 ändrade filer med 4530 tillägg och 1359 borttagningar

Visa fil

@@ -116,7 +116,7 @@ void __init versatile_init_irq(void)
{
unsigned int i;
vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0);
vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0);
set_irq_chained_handler(IRQ_VICSOURCE31, sic_handle_irq);