diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 20:10:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-14 20:10:33 -0400 |
| commit | a11c5c9ef6dc562fc7df7aaf7911569a85f4d71c (patch) | |
| tree | 6e0a6c7a259287e201ab3e727c8d85286e93159a /sound/pci/oxygen/virtuoso.c | |
| parent | 179c0ac67b9d947d2de69e9f08a743e7c74a8dce (diff) | |
| parent | 9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1 (diff) | |
Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull DEFINE_PCI_DEVICE_TABLE removal from Bjorn Helgaas:
"Part two of the PCI changes for v3.17:
- Remove DEFINE_PCI_DEVICE_TABLE macro use (Benoit Taine)
It's a mechanical change that removes uses of the
DEFINE_PCI_DEVICE_TABLE macro. I waited until later in the merge
window to reduce conflicts, but it's possible you'll still see a few"
* tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
| -rw-r--r-- | sound/pci/oxygen/virtuoso.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index dbbbacfd535e..7b317a28a19c 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c | |||
| @@ -41,7 +41,7 @@ MODULE_PARM_DESC(id, "ID string"); | |||
| 41 | module_param_array(enable, bool, NULL, 0444); | 41 | module_param_array(enable, bool, NULL, 0444); |
| 42 | MODULE_PARM_DESC(enable, "enable card"); | 42 | MODULE_PARM_DESC(enable, "enable card"); |
| 43 | 43 | ||
| 44 | static DEFINE_PCI_DEVICE_TABLE(xonar_ids) = { | 44 | static const struct pci_device_id xonar_ids[] = { |
| 45 | { OXYGEN_PCI_SUBID(0x1043, 0x8269) }, | 45 | { OXYGEN_PCI_SUBID(0x1043, 0x8269) }, |
| 46 | { OXYGEN_PCI_SUBID(0x1043, 0x8275) }, | 46 | { OXYGEN_PCI_SUBID(0x1043, 0x8275) }, |
| 47 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7) }, | 47 | { OXYGEN_PCI_SUBID(0x1043, 0x82b7) }, |