diff options
| author |   Adrian Bunk <bunk@kernel.org> | 2007-12-11 23:23:06 +0100 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-12-14 15:26:22 -0500 |
| commit | 33390a700129aa03f3808c35de017650a688f82a (patch) | |
| tree | bd022de0b115ac5182aeeb593b674a25551b38d4 /drivers/net/s2io.c | |
| parent | drivers/net/sis190.c section fix (diff) | |
| download | linux-dev-33390a700129aa03f3808c35de017650a688f82a.tar.xz linux-dev-33390a700129aa03f3808c35de017650a688f82a.zip | |
drivers/net/s2io.c section fixes
Code used by the non-__devinit s2io_open() mustn't be __devinit.
This patch fixes the following section mismatch with CONFIG_HOTPLUG=n:
<-- snip -->
...
WARNING: vmlinux.o(.text+0x6f6e3e): Section mismatch: reference to .init.text.20:s2io_test_intr (between 's2io_open' and 's2io_ethtool_sset')
...
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 121cb100f93a..9d80f1cf73ac 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -3737,7 +3737,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic) } /* Handle software interrupt used during MSI(X) test */ -static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id) +static irqreturn_t s2io_test_intr(int irq, void *dev_id) { struct s2io_nic *sp = dev_id; @@ -3748,7 +3748,7 @@ static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id) } /* Test interrupt path by forcing a a software IRQ */ -static int __devinit s2io_test_msi(struct s2io_nic *sp) +static int s2io_test_msi(struct s2io_nic *sp) { struct pci_dev *pdev = sp->pdev; struct XENA_dev_config __iomem *bar0 = sp->bar0; |