diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-11-27 15:34:07 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-27 15:34:07 -0800 |
| commit | feea6a574d432e08cebf66d993a6ed1f310e0e5d (patch) | |
| tree | 8b82e3bdcc1b702788744d2045e6c8b8b69f80b4 | |
| parent | 157653ce79a606409a8bfb496cba797b2984b18f (diff) | |
| download | op-kernel-dev-feea6a574d432e08cebf66d993a6ed1f310e0e5d.zip op-kernel-dev-feea6a574d432e08cebf66d993a6ed1f310e0e5d.tar.gz | |
ixgbe: section fixes
ixgbe_init_interrupt_scheme() is called from ixgbe_resume(). Build that
with CONFIG_PM and without CONFIG_HOTPLUG and you've got a problem.
Several helpers called by it also are misannotated __devinit.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 39869f9..e014a73 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -2460,7 +2460,7 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter, * Once we know the feature-set enabled for the device, we'll cache * the register offset the descriptor ring is assigned to. **/ -static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) +static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) { int feature_mask = 0, rss_i; int i, txr_idx, rxr_idx; @@ -2565,8 +2565,7 @@ err_tx_ring_allocation: * Attempt to configure the interrupts using the best available * capabilities of the hardware and the kernel. **/ -static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter - *adapter) +static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) { int err = 0; int vector, v_budget; |
