diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /arch/x86/mach-voyager/setup.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'arch/x86/mach-voyager/setup.c')
| -rw-r--r-- | arch/x86/mach-voyager/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c index 6bbdd633864c..a580b9562e76 100644 --- a/arch/x86/mach-voyager/setup.c +++ b/arch/x86/mach-voyager/setup.c | |||
| @@ -27,7 +27,7 @@ static struct irqaction irq2 = { | |||
| 27 | void __init intr_init_hook(void) | 27 | void __init intr_init_hook(void) |
| 28 | { | 28 | { |
| 29 | #ifdef CONFIG_SMP | 29 | #ifdef CONFIG_SMP |
| 30 | smp_intr_init(); | 30 | voyager_smp_intr_init(); |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | setup_irq(2, &irq2); | 33 | setup_irq(2, &irq2); |