Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-arm / hardware / vic.h

diff --git a/include/asm-arm/hardware/vic.h b/include/asm-arm/hardware/vic.h
index 81825eb54c9e89cf0f845fec95e2488d1e27218c..ed9ca3736a0be3c02630a29f5f00490731402907 100644 (file)
--- a/include/asm-arm/hardware/vic.h
+++ b/include/asm-arm/hardware/vic.h
@@ -39,7 +39,7 @@
 #define VIC_VECT_CNTL_ENABLE           (1 << 5)
 
 #ifndef __ASSEMBLY__
-void vic_init(void __iomem *base, u32 vic_sources);
+void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources);
 #endif
 
 #endif