diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-23 11:18:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-23 11:18:47 +0200 |
| commit | 8a517c514d5893602cf85c1b4c47afbbc04d2198 (patch) | |
| tree | e7c40f68ef97bb2bdb4c366c0b45437bc049feb1 /arch/arm/include/asm/hardware/vic.h | |
| parent | x86, cpu: cpu/proc.c display cache alignment and address sizes for 32 bit (diff) | |
| parent | Linux 2.6.31-rc7 (diff) | |
| download | linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.tar.xz linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.zip | |
Merge commit 'v2.6.31-rc7' into x86/cpu
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 |