diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/sb1000.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/sb1000.c')
| -rw-r--r-- | drivers/net/sb1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index c9c70ab0cce0..9f83a1197375 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
| @@ -973,7 +973,7 @@ sb1000_open(struct net_device *dev) | |||
| 973 | lp->rx_frame_id[1] = 0; | 973 | lp->rx_frame_id[1] = 0; |
| 974 | lp->rx_frame_id[2] = 0; | 974 | lp->rx_frame_id[2] = 0; |
| 975 | lp->rx_frame_id[3] = 0; | 975 | lp->rx_frame_id[3] = 0; |
| 976 | if (request_irq(dev->irq, &sb1000_interrupt, 0, "sb1000", dev)) { | 976 | if (request_irq(dev->irq, sb1000_interrupt, 0, "sb1000", dev)) { |
| 977 | return -EAGAIN; | 977 | return -EAGAIN; |
| 978 | } | 978 | } |
| 979 | 979 | ||