git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
apus_setup.c
diff --git
a/arch/ppc/platforms/apus_setup.c
b/arch/ppc/platforms/apus_setup.c
index
fe0cdc0
..
1d034ea
100644
(file)
--- a/
arch/ppc/platforms/apus_setup.c
+++ b/
arch/ppc/platforms/apus_setup.c
@@
-11,7
+11,6
@@
* Amiga specific stuff into mach/amiga.
*/
* Amiga specific stuff into mach/amiga.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/init.h>
@@
-734,9
+733,9
@@
void apus_init_IRQ(void)
for ( i = 0 ; i < AMI_IRQS; i++ ) {
irq_desc[i].status = IRQ_LEVEL;
if (i < IRQ_AMIGA_AUTO) {
for ( i = 0 ; i < AMI_IRQS; i++ ) {
irq_desc[i].status = IRQ_LEVEL;
if (i < IRQ_AMIGA_AUTO) {
- irq_desc[i].
handler
= &amiga_irqctrl;
+ irq_desc[i].
chip
= &amiga_irqctrl;
} else {
} else {
- irq_desc[i].
handler
= &amiga_sys_irqctrl;
+ irq_desc[i].
chip
= &amiga_sys_irqctrl;
action = &amiga_sys_irqaction[i-IRQ_AMIGA_AUTO];
if (action->name)
setup_irq(i, action);
action = &amiga_sys_irqaction[i-IRQ_AMIGA_AUTO];
if (action->name)
setup_irq(i, action);