Commit 6ed84ee7 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik

[PATCH] s2io section fix

s2io_rem_nic() is marked __exit and is being referred to from .data.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 76135c52
......@@ -238,7 +238,7 @@ static struct pci_driver s2io_driver = {
name:"S2IO",
id_table:s2io_tbl,
probe:s2io_init_nic,
remove:s2io_rem_nic,
remove:__devexit_p(s2io_rem_nic),
};
/*
......@@ -4355,7 +4355,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
* and free up all resource held up by the device. This could be in response
* to a Hot plug event or when the driver is to be removed from memory.
*/
static void __exit s2io_rem_nic(struct pci_dev *pdev)
static void __devexit s2io_rem_nic(struct pci_dev *pdev)
{
struct net_device *dev =
(struct net_device *) pci_get_drvdata(pdev);
......
......@@ -825,7 +825,7 @@ static inline void writeq(u64 val, void *addr)
*/
static int __devinit s2io_init_nic(struct pci_dev *pdev,
const struct pci_device_id *pre);
static void __exit s2io_rem_nic(struct pci_dev *pdev);
static void __devexit s2io_rem_nic(struct pci_dev *pdev);
static int initSharedMem(struct s2io_nic *sp);
static void freeSharedMem(struct s2io_nic *sp);
static int initNic(struct s2io_nic *nic);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment