diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:49 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 12:38:49 +0100 |
commit | 12c2a682b55a40f2a986e36d6632110029bc63a5 (patch) | |
tree | ba21f049e4859411f6c135d597dc26260963ce7c /sound/pci/intel8x0m.c | |
parent | a86ba28583987b85845ed61be5f12aafb5fc4971 (diff) | |
parent | aefbd3e823d4fe219bb6420b0cac505847270507 (diff) | |
download | kernel-crypto-12c2a682b55a40f2a986e36d6632110029bc63a5.tar.gz kernel-crypto-12c2a682b55a40f2a986e36d6632110029bc63a5.tar.xz kernel-crypto-12c2a682b55a40f2a986e36d6632110029bc63a5.zip |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/intel8x0m.c')
-rw-r--r-- | sound/pci/intel8x0m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 9e7d12e7673..13cec1e5ced 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -219,7 +219,7 @@ struct intel8x0m { unsigned int pcm_pos_shift; }; -static struct pci_device_id snd_intel8x0m_ids[] = { +static DEFINE_PCI_DEVICE_TABLE(snd_intel8x0m_ids) = { { PCI_VDEVICE(INTEL, 0x2416), DEVICE_INTEL }, /* 82801AA */ { PCI_VDEVICE(INTEL, 0x2426), DEVICE_INTEL }, /* 82901AB */ { PCI_VDEVICE(INTEL, 0x2446), DEVICE_INTEL }, /* 82801BA */ |