diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 12:08:20 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 12:08:20 +1100 |
commit | 690aec178e11ccaf89124131fb526b5d730a3201 (patch) | |
tree | 86d54511a63809847d80e389cd7d5890ef2a812f /drivers/net/wan/farsync.c | |
parent | 158d5543adca081d004d23d441b6bed8cb392ffb (diff) | |
parent | cdaff1854f32ac9ddb4733530f617d32188665ed (diff) |
Merge remote branch 'net/master'
Diffstat (limited to 'drivers/net/wan/farsync.c')
-rw-r--r-- | drivers/net/wan/farsync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 9bc2e3649157..40d724a8e020 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c @@ -528,7 +528,7 @@ static int fst_debug_mask = { FST_DEBUG }; /* * PCI ID lookup table */ -static struct pci_device_id fst_pci_dev_id[] __devinitdata = { +static DEFINE_PCI_DEVICE_TABLE(fst_pci_dev_id) = { {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, PCI_ANY_ID, 0, 0, FST_TYPE_T2P}, |