diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 15:47:41 -0500 |
| commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
| tree | bc16200f3b6ea150b298422754e32959eaa339bc /drivers/macintosh/via-macii.c | |
| parent | 951c486f62490e032da0ad17e93270b0cfb6687f (diff) | |
| parent | 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe (diff) | |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'drivers/macintosh/via-macii.c')
| -rw-r--r-- | drivers/macintosh/via-macii.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c index 817f37a875c9..c9570fcf1cce 100644 --- a/drivers/macintosh/via-macii.c +++ b/drivers/macintosh/via-macii.c | |||
| @@ -159,7 +159,7 @@ int macii_init(void) | |||
| 159 | err = macii_init_via(); | 159 | err = macii_init_via(); |
| 160 | if (err) goto out; | 160 | if (err) goto out; |
| 161 | 161 | ||
| 162 | err = request_irq(IRQ_MAC_ADB, macii_interrupt, IRQ_FLG_LOCK, "ADB", | 162 | err = request_irq(IRQ_MAC_ADB, macii_interrupt, 0, "ADB", |
| 163 | macii_interrupt); | 163 | macii_interrupt); |
| 164 | if (err) goto out; | 164 | if (err) goto out; |
| 165 | 165 | ||