diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /arch/ppc/amiga | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'arch/ppc/amiga')
| -rw-r--r-- | arch/ppc/amiga/amiints.c | 2 | ||||
| -rw-r--r-- | arch/ppc/amiga/config.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/amiga/amiints.c b/arch/ppc/amiga/amiints.c index e8f72f298..a221dc59b 100644 --- a/arch/ppc/amiga/amiints.c +++ b/arch/ppc/amiga/amiints.c @@ -108,7 +108,7 @@ __initfunc(void amiga_init_IRQ(void)) custom.intreq = 0x7fff; #ifdef CONFIG_APUS - /* Clear any inter-CPU interupt requests. Circumvents bug in + /* Clear any inter-CPU interrupt requests. Circumvents bug in Blizzard IPL emulation HW (or so it appears). */ APUS_WRITE(APUS_INT_LVL, INTLVL_SETRESET | INTLVL_MASK); diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c index 2335adfb9..5a38fa7f0 100644 --- a/arch/ppc/amiga/config.c +++ b/arch/ppc/amiga/config.c @@ -30,7 +30,6 @@ void (*kbd_reset_setup) (char *, int) __initdata = 0; #include <linux/kd.h> #include <linux/tty.h> #include <linux/console.h> -#include <linux/init.h> #include <asm/bootinfo.h> #include <asm/setup.h> |