summaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/mc5.c
diff options
context:
space:
mode:
authorRoland Dreier <rdreier@cisco.com>2008-01-29 23:45:11 +0100
committerDavid S. Miller <davem@davemloft.net>2008-02-03 13:28:35 +0100
commit7b9b09436b8720621e5594ce25fd25f34d5d42be (patch)
treedbcf98ca8f2485d20c50411a50c058f2df602e80 /drivers/net/cxgb3/mc5.c
parentbonding: update MAINTAINERS (diff)
downloadlinux-7b9b09436b8720621e5594ce25fd25f34d5d42be.tar.xz
linux-7b9b09436b8720621e5594ce25fd25f34d5d42be.zip
cxgb3: Remove incorrect __devinit annotations
When PCI error recovery was added to cxgb3, a function t3_io_slot_reset() was added. This function can call back into t3_prep_adapter() at any time, so t3_prep_adapter() can no longer be marked __devinit. This patch removes the __devinit annotation from t3_prep_adapter() and all the functions that it calls, which fixes WARNING: drivers/net/cxgb3/built-in.o(.text+0x2427): Section mismatch in reference from the function t3_io_slot_reset() to the function .devinit.text:t3_prep_adapter() Signed-off-by: Roland Dreier <rolandd@cisco.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/mc5.c')
-rw-r--r--drivers/net/cxgb3/mc5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/mc5.c b/drivers/net/cxgb3/mc5.c
index 84c1ffa8e2d3..4c4d6e877ea6 100644
--- a/drivers/net/cxgb3/mc5.c
+++ b/drivers/net/cxgb3/mc5.c
@@ -452,7 +452,7 @@ void t3_mc5_intr_handler(struct mc5 *mc5)
t3_write_reg(adap, A_MC5_DB_INT_CAUSE, cause);
}
-void __devinit t3_mc5_prep(struct adapter *adapter, struct mc5 *mc5, int mode)
+void t3_mc5_prep(struct adapter *adapter, struct mc5 *mc5, int mode)
{
#define K * 1024