diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-11 01:40:55 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-11 01:41:06 +0400 |
| commit | 547c32aeb5a24178ef20488ae0508efcc32ae8e4 (patch) | |
| tree | fdc33154820cfddc845cef2f67380dace655b28f /arch/arm/include/asm/hardware/vic.h | |
| parent | b0efb42478c81ed0ed9aa0dc444db200c32624f0 (diff) | |
| parent | 99ae99533a059750c4b0f76295625b8ac5ea751a (diff) | |
| download | linux-547c32aeb5a24178ef20488ae0508efcc32ae8e4.tar.xz | |
Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/include/asm/hardware/vic.h')
| -rw-r--r-- | arch/arm/include/asm/hardware/vic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/hardware/vic.h b/arch/arm/include/asm/hardware/vic.h index f87328d4a180..5d72550a8097 100644 --- a/arch/arm/include/asm/hardware/vic.h +++ b/arch/arm/include/asm/hardware/vic.h @@ -41,7 +41,7 @@ #define VIC_PL192_VECT_ADDR 0xF00 #ifndef __ASSEMBLY__ -void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources); +void vic_init(void __iomem *base, unsigned int irq_start, u32 vic_sources, u32 resume_sources); #endif #endif |