diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 19:01:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 19:01:04 +0100 |
| commit | 1cf02bbd51a1ff74a31f88b1f654243a4affef8d (patch) | |
| tree | 6f7b43be22d6aeabe652d30e87b7c267c3cb9cbf /arch/arm/plat-samsung/include | |
| parent | 805499a6d5d7b7fa8528170d1b2869ea88485f99 (diff) | |
| parent | bd7e388035d3c80aab360f18d123eb2e06eda8d1 (diff) | |
Merge branch 'samsung-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-samsung/include')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/irq-vic-timer.h b/arch/arm/plat-samsung/include/plat/irq-vic-timer.h index a90b53431b5..5b9c42fd32d 100644 --- a/arch/arm/plat-samsung/include/plat/irq-vic-timer.h +++ b/arch/arm/plat-samsung/include/plat/irq-vic-timer.h @@ -10,4 +10,4 @@ * published by the Free Software Foundation. */ -extern void s3c_init_vic_timer_irq(unsigned int vic, unsigned int timer); +extern void s3c_init_vic_timer_irq(unsigned int num, unsigned int timer_irq); |