aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac/macints.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2015-09-29 03:27:22 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2015-11-23 03:58:30 -0500
commit70bc53b473435f43dcf7d91304e28dd6e0ffda14 (patch)
treea660273e56aea7b724693c61aa44e78cd9a7d526 /arch/m68k/mac/macints.c
parent1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff)
m68k/mac: Kill psc_present
The presence of the Apple Peripheral System Controller (PSC) can be tested for by just checking its base address pointer. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/mac/macints.c')
-rw-r--r--arch/m68k/mac/macints.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 5c1a6b2ff0af..9f98c0871901 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -174,7 +174,7 @@ void __init mac_init_IRQ(void)
174 oss_register_interrupts(); 174 oss_register_interrupts();
175 else 175 else
176 via_register_interrupts(); 176 via_register_interrupts();
177 if (psc_present) 177 if (psc)
178 psc_register_interrupts(); 178 psc_register_interrupts();
179 if (baboon_present) 179 if (baboon_present)
180 baboon_register_interrupts(); 180 baboon_register_interrupts();
@@ -212,7 +212,7 @@ void mac_irq_enable(struct irq_data *data)
212 case 4: 212 case 4:
213 case 5: 213 case 5:
214 case 6: 214 case 6:
215 if (psc_present) 215 if (psc)
216 psc_irq_enable(irq); 216 psc_irq_enable(irq);
217 else if (oss_present) 217 else if (oss_present)
218 oss_irq_enable(irq); 218 oss_irq_enable(irq);
@@ -242,7 +242,7 @@ void mac_irq_disable(struct irq_data *data)
242 case 4: 242 case 4:
243 case 5: 243 case 5:
244 case 6: 244 case 6:
245 if (psc_present) 245 if (psc)
246 psc_irq_disable(irq); 246 psc_irq_disable(irq);
247 else if (oss_present) 247 else if (oss_present)
248 oss_irq_disable(irq); 248 oss_irq_disable(irq);