diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 18:23:59 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 23:16:54 +0400 |
| commit | 654b8c5ce3b32403a915dfd41d92ad3118c3406e (patch) | |
| tree | c9759e128c3ef940290b0b6d1e1a2994ad50fff5 /drivers/net/ethernet/micrel/ksz884x.c | |
| parent | 33897cc869eef8b878b2408f77b7b0387e43e74e (diff) | |
| download | linux-654b8c5ce3b32403a915dfd41d92ad3118c3406e.tar.xz | |
net/micrel: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.
Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/micrel/ksz884x.c')
| -rw-r--r-- | drivers/net/ethernet/micrel/ksz884x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index d16ef24e622f..f3f09b18a707 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c @@ -1487,7 +1487,7 @@ struct dev_priv { #define DRV_VERSION "1.0.0" #define DRV_RELDATE "Feb 8, 2010" -static char version[] __devinitdata = +static char version[] = "Micrel " DEVICE_NAME " " DRV_VERSION " (" DRV_RELDATE ")"; static u8 DEFAULT_MAC_ADDRESS[] = { 0x00, 0x10, 0xA1, 0x88, 0x42, 0x01 }; @@ -6919,7 +6919,7 @@ static void read_other_addr(struct ksz_hw *hw) #define PCI_VENDOR_ID_MICREL_KS 0x16c6 #endif -static int __devinit pcidev_init(struct pci_dev *pdev, +static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id) { struct net_device *dev; |