diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:10:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:10:24 -0800 |
| commit | 9e09d05cfe7df9efa7bbca7d679af534a616026e (patch) | |
| tree | ae9501674896ae1bc19a78ad4c97fbfc666e4bcb /drivers/macintosh | |
| parent | d60a540ac5f2fbab3e6fe592717b445bd7343a91 (diff) | |
| parent | 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 (diff) | |
| download | op-kernel-dev-9e09d05cfe7df9efa7bbca7d679af534a616026e.zip op-kernel-dev-9e09d05cfe7df9efa7bbca7d679af534a616026e.tar.gz | |
Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- more printk modernization
- various cleanups and fixes (incl. a race condition) for Mac
- defconfig updates
* tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/defconfig: Update defconfigs for v4.14-rc7
m68k/mac: Add mutual exclusion for IOP interrupt polling
m68k/mac: Disentangle VIA/RBV and NuBus initialization
m68k/mac: Disentangle VIA and OSS initialization
m68k/mac: More printk modernization
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/adb-iop.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c index dbc4a3e..15db69d 100644 --- a/drivers/macintosh/adb-iop.c +++ b/drivers/macintosh/adb-iop.c @@ -30,8 +30,6 @@ /*#define DEBUG_ADB_IOP*/ -extern void iop_ism_irq(int, void *); - static struct adb_request *current_req; static struct adb_request *last_req; #if 0 @@ -266,7 +264,7 @@ int adb_iop_autopoll(int devs) void adb_iop_poll(void) { if (adb_iop_state == idle) adb_iop_start(); - iop_ism_irq(0, (void *) ADB_IOP); + iop_ism_irq_poll(ADB_IOP); } int adb_iop_reset_bus(void) |
