aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/e1000e/e1000.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-04 22:31:41 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-04 22:31:41 -0800
commitb405e8df26dfe4c56ab3f88f5cc1dfab0d220289 (patch)
treeb6a1edf4f519536ad22c69a7d342038315859264 /drivers/net/e1000e/e1000.h
parent570930fe1ee497de6aafd895dbe80116cb10525f (diff)
e1000e: Fix namespace conflicts wrt. e1000_has_link
Reported by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
-rw-r--r--drivers/net/e1000e/e1000.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
index 318bdb28a7c..c2ec095d216 100644
--- a/drivers/net/e1000e/e1000.h
+++ b/drivers/net/e1000e/e1000.h
@@ -459,7 +459,7 @@ extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);
extern void e1000e_free_rx_resources(struct e1000_adapter *adapter);
extern void e1000e_free_tx_resources(struct e1000_adapter *adapter);
extern void e1000e_update_stats(struct e1000_adapter *adapter);
-extern bool e1000_has_link(struct e1000_adapter *adapter);
+extern bool e1000e_has_link(struct e1000_adapter *adapter);
extern void e1000e_set_interrupt_capability(struct e1000_adapter *adapter);
extern void e1000e_reset_interrupt_capability(struct e1000_adapter *adapter);