diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-07-13 21:48:30 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-08 22:35:50 +0100 |
| commit | ddc7fd25d09678f8252c0321ef4b66e8451abe7d (patch) | |
| tree | e95db89cd1801787baa2c0cc1dad2f1de64d0f49 | |
| parent | fb1b646aa3bcae2f8211136a6b40228c7c9d236c (diff) | |
| download | linux-stable-ddc7fd25d09678f8252c0321ef4b66e8451abe7d.tar.gz linux-stable-ddc7fd25d09678f8252c0321ef4b66e8451abe7d.tar.bz2 linux-stable-ddc7fd25d09678f8252c0321ef4b66e8451abe7d.zip | |
m68k/mac: Convert Mac to genirq
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
| -rw-r--r-- | arch/m68k/mac/baboon.c | 3 | ||||
| -rw-r--r-- | arch/m68k/mac/oss.c | 3 | ||||
| -rw-r--r-- | arch/m68k/mac/psc.c | 3 | ||||
| -rw-r--r-- | arch/m68k/mac/via.c | 3 |
5 files changed, 12 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 9000921385aa..9ba1a89e0032 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -87,7 +87,6 @@ config MMU_SUN3 config USE_GENERIC_HARDIRQS bool "Use genirq" depends on MMU - depends on !MAC depends on !APOLLO depends on !MVME147 depends on !MVME16x diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c index f264791b8694..ff11746b0621 100644 --- a/arch/m68k/mac/baboon.c +++ b/arch/m68k/mac/baboon.c @@ -11,6 +11,9 @@ #include <linux/mm.h> #include <linux/delay.h> #include <linux/init.h> +#ifdef CONFIG_GENERIC_HARDIRQS +#include <linux/irq.h> +#endif #include <asm/traps.h> #include <asm/bootinfo.h> diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c index 1eb60f071007..ed952704e6ee 100644 --- a/arch/m68k/mac/oss.c +++ b/arch/m68k/mac/oss.c @@ -19,6 +19,9 @@ #include <linux/mm.h> #include <linux/delay.h> #include <linux/init.h> +#ifdef CONFIG_GENERIC_HARDIRQS +#include <linux/irq.h> +#endif #include <asm/bootinfo.h> #include <asm/macintosh.h> diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index 26c2b6595808..0a34b7afc376 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c @@ -18,6 +18,9 @@ #include <linux/mm.h> #include <linux/delay.h> #include <linux/init.h> +#ifdef CONFIG_GENERIC_HARDIRQS +#include <linux/irq.h> +#endif #include <asm/traps.h> #include <asm/bootinfo.h> diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index af9ed33bec14..bde156caa46d 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c @@ -28,6 +28,9 @@ #include <linux/delay.h> #include <linux/init.h> #include <linux/module.h> +#ifdef CONFIG_GENERIC_HARDIRQS +#include <linux/irq.h> +#endif #include <asm/bootinfo.h> #include <asm/macintosh.h> |