diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
| commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
| tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /drivers/net/wan/farsync.c | |
| parent | c414a117c6094c3f86b533f97beaf45ef9075f03 (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge branch 'v2.6.34-rc2' into drm-linus
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 9bc2e364915..40d724a8e02 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}, |