diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/ixgbe | |
| parent | 851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff) | |
| parent | 3ec192559033ed457f0d7856838654c100fc659f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'drivers/net/ixgbe')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 15d511cc2989..7e1cc6efc64c 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -1352,7 +1352,6 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter) | |||
| 1352 | * ixgbe_intr - legacy mode Interrupt Handler | 1352 | * ixgbe_intr - legacy mode Interrupt Handler |
| 1353 | * @irq: interrupt number | 1353 | * @irq: interrupt number |
| 1354 | * @data: pointer to a network interface device structure | 1354 | * @data: pointer to a network interface device structure |
| 1355 | * @pt_regs: CPU registers structure | ||
| 1356 | **/ | 1355 | **/ |
| 1357 | static irqreturn_t ixgbe_intr(int irq, void *data) | 1356 | static irqreturn_t ixgbe_intr(int irq, void *data) |
| 1358 | { | 1357 | { |