diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /arch/ppc/kernel | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'arch/ppc/kernel')
| -rw-r--r-- | arch/ppc/kernel/feature.c | 8 | ||||
| -rw-r--r-- | arch/ppc/kernel/m8xx_setup.c | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/ppc/kernel/feature.c b/arch/ppc/kernel/feature.c index d14c7380a..d5baa3747 100644 --- a/arch/ppc/kernel/feature.c +++ b/arch/ppc/kernel/feature.c @@ -184,14 +184,14 @@ feature_init(void) if (controller_count) printk(KERN_INFO "Registered %d feature controller(s)\n", controller_count); -#ifdef CONFIG_PMAC_PBOOK -#ifdef CONFIG_DMASOUND_MODULE - /* On PowerBooks, we disable the sound chip when dmasound is a module */ +#if defined(CONFIG_PMAC_PBOOK) && !defined(CONFIG_DMASOUND_AWACS) + /* On PowerBooks, we disable the sound chip when dmasound is a module + * or not used at all + */ if (controller_count && find_devices("via-pmu") != NULL) { feature_clear(controllers[0].device, FEATURE_Sound_power); feature_clear(controllers[0].device, FEATURE_Sound_CLK_enable); } -#endif #endif } diff --git a/arch/ppc/kernel/m8xx_setup.c b/arch/ppc/kernel/m8xx_setup.c index 36e886d0c..a417bed2e 100644 --- a/arch/ppc/kernel/m8xx_setup.c +++ b/arch/ppc/kernel/m8xx_setup.c @@ -276,7 +276,6 @@ m8xx_init_IRQ(void) int i; void cpm_interrupt_init(void); - ppc8xx_pic.irq_offset = 0; for ( i = 0 ; i < NR_SIU_INTS ; i++ ) irq_desc[i].handler = &ppc8xx_pic; |