diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-24 03:38:30 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-24 03:38:30 +0100 |
| commit | 9e41d9597e7825ec20d690013d32bcec5f3fe16a (patch) | |
| tree | ac6fea59e9a4a1c2183d6bbd6ffa760680673afb /drivers/net/netxen/netxen_nic.h | |
| parent | Merge commit 'gcl/next' into next (diff) | |
| parent | Linux 2.6.29 (diff) | |
| download | linux-9e41d9597e7825ec20d690013d32bcec5f3fe16a.tar.xz linux-9e41d9597e7825ec20d690013d32bcec5f3fe16a.zip | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/netxen/netxen_nic.h')
| -rw-r--r-- | drivers/net/netxen/netxen_nic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index f4dd9acb6877..1ff066b2281a 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h @@ -1595,7 +1595,6 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter) } -int netxen_is_flash_supported(struct netxen_adapter *adapter); int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac); int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac); extern void netxen_change_ringparam(struct netxen_adapter *adapter); |