diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:33:51 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:33:51 -0800 |
commit | 2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8 (patch) | |
tree | 97383c07c5ba1bf78ad50be4574e7f2fb26f9c15 /arch/m68k/mac/macints.c | |
parent | c5c80bd923d34f7dc70e7b23eb427cd284989a1b (diff) | |
parent | eb37bc3f85b69f529d2ad06c41fad8dedd654c76 (diff) | |
download | linux-stable-2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8.tar.gz linux-stable-2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8.tar.bz2 linux-stable-2945e9f111e2f5f7d7b0f4af0a56b9f768db9fc8.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Provide __phys_to_pfn() and __pfn_to_phys()
m68k/atari, m68k/sun3: Fix SCSI platform device registration when driver is modular
m68k/defconfig: Update defconfigs for v4.4-rc1
m68k/mac: Kill psc_present
Diffstat (limited to 'arch/m68k/mac/macints.c')
-rw-r--r-- | arch/m68k/mac/macints.c | 6 |
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) oss_register_interrupts(); else via_register_interrupts(); - if (psc_present) + if (psc) psc_register_interrupts(); if (baboon_present) baboon_register_interrupts(); @@ -212,7 +212,7 @@ void mac_irq_enable(struct irq_data *data) case 4: case 5: case 6: - if (psc_present) + if (psc) psc_irq_enable(irq); else if (oss_present) oss_irq_enable(irq); @@ -242,7 +242,7 @@ void mac_irq_disable(struct irq_data *data) case 4: case 5: case 6: - if (psc_present) + if (psc) psc_irq_disable(irq); else if (oss_present) oss_irq_disable(irq); |