Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia

[karo-tx-linux.git] / drivers / pcmcia / i82092.c

diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index 0b66bfc0e14872c2715ae6bfdf06d716300ea1b2..4e8831bdb6efb2af19e4a25114cbc80daabc3bb7 100644 (file)
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -25,14 +25,9 @@
 MODULE_LICENSE("GPL");
 
 /* PCI core routines */
-static struct pci_device_id i82092aa_pci_ids[] = {
-       {
-             .vendor = PCI_VENDOR_ID_INTEL,
-             .device = PCI_DEVICE_ID_INTEL_82092AA_0,
-             .subvendor = PCI_ANY_ID,
-             .subdevice = PCI_ANY_ID,
-        },
-        {} 
+static DEFINE_PCI_DEVICE_TABLE(i82092aa_pci_ids) = {
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82092AA_0) },
+       { }
 };
 MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);