diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 01:00:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 01:00:48 +0200 |
| commit | a6f707b601c3f85d4b816ea08a757ea1af4f1cc0 (patch) | |
| tree | 86cea1675e515c6baca64cea812ebe2ccc6aa955 /drivers/pcmcia/i82092.c | |
| parent | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | pcmcia at91_cf: fix raw gpio number usage (diff) | |
| download | linux-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.tar.xz linux-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
Pull a few PCMCIA updates from Dominik Brodowski.
Fix up trivial conflict (modified code in question had been removed) in
drivers/pcmcia/soc_common.c.
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
pcmcia at91_cf: fix raw gpio number usage
ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
pcmcia: irq: Remove IRQF_DISABLED
Diffstat (limited to 'drivers/pcmcia/i82092.c')
| -rw-r--r-- | drivers/pcmcia/i82092.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index 0b66bfc0e148..4e8831bdb6ef 100644 --- 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); |