From 5869d0405be05d82e279a3c21ac715d1bc4ff82c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 27 Nov 2008 15:34:07 -0800 Subject: [PATCH] --- yaml --- r: 122357 b: refs/heads/master c: feea6a574d432e08cebf66d993a6ed1f310e0e5d h: refs/heads/master i: 122355: 22062e5d32da5bb0a7b835f19abcd40204d9e15d v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3096995a6628..5895529b5b89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 157653ce79a606409a8bfb496cba797b2984b18f +refs/heads/master: feea6a574d432e08cebf66d993a6ed1f310e0e5d diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 39869f90bdc9..e014a737a22e 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/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 @@ static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter) * 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;