diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 06:43:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 06:43:05 -0500 |
| commit | 81444a799550214f549caf579cf65a0ca55e70b7 (patch) | |
| tree | 3288dac0740be2e1e7d1af4ee51d792a6e91edf3 /drivers/net/ixgbe | |
| parent | a64d31baed104be25305e9c71585d3ea4ee9a418 (diff) | |
| parent | da485e0cb16726797e99a595a399b9fc721b91bc (diff) | |
Merge branch 'tracing/fastboot' into cpus4096
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 8ed823ae639e..5236f633ee36 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -1320,7 +1320,6 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter) | |||
| 1320 | * ixgbe_intr - legacy mode Interrupt Handler | 1320 | * ixgbe_intr - legacy mode Interrupt Handler |
| 1321 | * @irq: interrupt number | 1321 | * @irq: interrupt number |
| 1322 | * @data: pointer to a network interface device structure | 1322 | * @data: pointer to a network interface device structure |
| 1323 | * @pt_regs: CPU registers structure | ||
| 1324 | **/ | 1323 | **/ |
| 1325 | static irqreturn_t ixgbe_intr(int irq, void *data) | 1324 | static irqreturn_t ixgbe_intr(int irq, void *data) |
| 1326 | { | 1325 | { |