aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-11-27 18:34:07 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-27 18:34:07 -0500
commitfeea6a574d432e08cebf66d993a6ed1f310e0e5d (patch)
tree8b82e3bdcc1b702788744d2045e6c8b8b69f80b4 /drivers/net/ixgbe
parent157653ce79a606409a8bfb496cba797b2984b18f (diff)
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>
Diffstat (limited to 'drivers/net/ixgbe')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 39869f90bdc..e014a737a22 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,
2460 * Once we know the feature-set enabled for the device, we'll cache 2460 * Once we know the feature-set enabled for the device, we'll cache
2461 * the register offset the descriptor ring is assigned to. 2461 * the register offset the descriptor ring is assigned to.
2462 **/ 2462 **/
2463static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) 2463static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
2464{ 2464{
2465 int feature_mask = 0, rss_i; 2465 int feature_mask = 0, rss_i;
2466 int i, txr_idx, rxr_idx; 2466 int i, txr_idx, rxr_idx;
@@ -2565,8 +2565,7 @@ err_tx_ring_allocation:
2565 * Attempt to configure the interrupts using the best available 2565 * Attempt to configure the interrupts using the best available
2566 * capabilities of the hardware and the kernel. 2566 * capabilities of the hardware and the kernel.
2567 **/ 2567 **/
2568static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter 2568static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
2569 *adapter)
2570{ 2569{
2571 int err = 0; 2570 int err = 0;
2572 int vector, v_budget; 2571 int vector, v_budget;