diff options
Diffstat (limited to 'arch/m68k/mac/baboon.c')
-rw-r--r-- | arch/m68k/mac/baboon.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c index 673a1085984d..dae9c982aa89 100644 --- a/arch/m68k/mac/baboon.c +++ b/arch/m68k/mac/baboon.c | |||
@@ -23,9 +23,7 @@ | |||
23 | /* #define DEBUG_IRQS */ | 23 | /* #define DEBUG_IRQS */ |
24 | 24 | ||
25 | int baboon_present; | 25 | int baboon_present; |
26 | volatile struct baboon *baboon; | 26 | static volatile struct baboon *baboon; |
27 | |||
28 | irqreturn_t baboon_irq(int, void *); | ||
29 | 27 | ||
30 | #if 0 | 28 | #if 0 |
31 | extern int macide_ack_intr(struct ata_channel *); | 29 | extern int macide_ack_intr(struct ata_channel *); |
@@ -50,20 +48,10 @@ void __init baboon_init(void) | |||
50 | } | 48 | } |
51 | 49 | ||
52 | /* | 50 | /* |
53 | * Register the Baboon interrupt dispatcher on nubus slot $C. | ||
54 | */ | ||
55 | |||
56 | void __init baboon_register_interrupts(void) | ||
57 | { | ||
58 | request_irq(IRQ_NUBUS_C, baboon_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST, | ||
59 | "baboon", (void *) baboon); | ||
60 | } | ||
61 | |||
62 | /* | ||
63 | * Baboon interrupt handler. This works a lot like a VIA. | 51 | * Baboon interrupt handler. This works a lot like a VIA. |
64 | */ | 52 | */ |
65 | 53 | ||
66 | irqreturn_t baboon_irq(int irq, void *dev_id) | 54 | static irqreturn_t baboon_irq(int irq, void *dev_id) |
67 | { | 55 | { |
68 | int irq_bit, irq_num; | 56 | int irq_bit, irq_num; |
69 | unsigned char events; | 57 | unsigned char events; |
@@ -95,6 +83,16 @@ irqreturn_t baboon_irq(int irq, void *dev_id) | |||
95 | return IRQ_HANDLED; | 83 | return IRQ_HANDLED; |
96 | } | 84 | } |
97 | 85 | ||
86 | /* | ||
87 | * Register the Baboon interrupt dispatcher on nubus slot $C. | ||
88 | */ | ||
89 | |||
90 | void __init baboon_register_interrupts(void) | ||
91 | { | ||
92 | request_irq(IRQ_NUBUS_C, baboon_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST, | ||
93 | "baboon", (void *) baboon); | ||
94 | } | ||
95 | |||
98 | void baboon_irq_enable(int irq) { | 96 | void baboon_irq_enable(int irq) { |
99 | #ifdef DEBUG_IRQUSE | 97 | #ifdef DEBUG_IRQUSE |
100 | printk("baboon_irq_enable(%d)\n", irq); | 98 | printk("baboon_irq_enable(%d)\n", irq); |