diff options
| author | David S. Miller <davem@davemloft.net> | 2012-12-03 15:35:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-03 15:35:28 -0500 |
| commit | 682d7978aee072f411fc747d32954a8371dd7b1b (patch) | |
| tree | eeda0abd33caeb14d0adbc5ffd2a9a8cbb4b2ac8 /drivers/net/ethernet/neterion/s2io.h | |
| parent | a5a81f0b9025867efb999d14a8dfc1907c5a4c3b (diff) | |
| parent | 9f9a12f8ca79839c948464a37c5b557808278708 (diff) | |
Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/net-next
Networking: Remove __dev* markings from the networking drivers
This is a series of patches that remove the dev* attributes for all
networking drivers, with the exception of wireless drivers, those are in
a different branch.
Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and
__devexit are no longer needed since CONFIG_HOTPLUG is being removed as
an option.
Note, there are some devinit compiler section mismatch warnings due to
this series, but they are fixed up when merged with my driver-next
branch, which fixes the PCI device id warnings, and removes the modpost
detection, as it's no longer needed.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion/s2io.h')
| -rw-r--r-- | drivers/net/ethernet/neterion/s2io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.h b/drivers/net/ethernet/neterion/s2io.h index d5596926a1e..032f9b6d850 100644 --- a/drivers/net/ethernet/neterion/s2io.h +++ b/drivers/net/ethernet/neterion/s2io.h @@ -1075,9 +1075,9 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order) /* * Prototype declaration. */ -static int __devinit s2io_init_nic(struct pci_dev *pdev, +static int s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre); -static void __devexit s2io_rem_nic(struct pci_dev *pdev); +static void s2io_rem_nic(struct pci_dev *pdev); static int init_shared_mem(struct s2io_nic *sp); static void free_shared_mem(struct s2io_nic *sp); static int init_nic(struct s2io_nic *nic); |