From b405e8df26dfe4c56ab3f88f5cc1dfab0d220289 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 4 Feb 2010 22:31:41 -0800 Subject: e1000e: Fix namespace conflicts wrt. e1000_has_link Reported by Stephen Rothwell. Signed-off-by: David S. Miller --- drivers/net/e1000e/e1000.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/e1000e/e1000.h') 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); -- cgit v1.2.3