diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-17 22:02:07 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-17 22:02:07 +0400 |
| commit | 9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch) | |
| tree | 5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /drivers/net/wireless/p54 | |
| parent | ccdbb6e96beca362db876d820ac1e560ff6d9579 (diff) | |
| parent | b6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff) | |
| download | linux-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/p54')
| -rw-r--r-- | drivers/net/wireless/p54/p54spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index 7fc46f26cf2b..de15171e2cd8 100644 --- a/drivers/net/wireless/p54/p54spi.c +++ b/drivers/net/wireless/p54/p54spi.c @@ -636,7 +636,7 @@ static int p54spi_probe(struct spi_device *spi) gpio_direction_input(p54spi_gpio_irq); ret = request_irq(gpio_to_irq(p54spi_gpio_irq), - p54spi_interrupt, IRQF_DISABLED, "p54spi", + p54spi_interrupt, 0, "p54spi", priv->spi); if (ret < 0) { dev_err(&priv->spi->dev, "request_irq() failed"); |