diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /drivers/macintosh/via-maciisi.c | |
| parent | slub: disallow changing cpu_partial from userspace for debug caches (diff) | |
| parent | slub: add missed accounting (diff) | |
| download | linux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz linux-5878cf431ca7233a56819ca6970153ac0b129599.zip | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'drivers/macintosh/via-maciisi.c')
| -rw-r--r-- | drivers/macintosh/via-maciisi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c index 9ab5b0c34f0d..34d02a91b29f 100644 --- a/drivers/macintosh/via-maciisi.c +++ b/drivers/macintosh/via-maciisi.c @@ -122,8 +122,8 @@ maciisi_init(void) return err; } - if (request_irq(IRQ_MAC_ADB, maciisi_interrupt, IRQ_FLG_LOCK | IRQ_FLG_FAST, - "ADB", maciisi_interrupt)) { + if (request_irq(IRQ_MAC_ADB, maciisi_interrupt, 0, "ADB", + maciisi_interrupt)) { printk(KERN_ERR "maciisi_init: can't get irq %d\n", IRQ_MAC_ADB); return -EAGAIN; } |