summaryrefslogtreecommitdiffstats
path: root/sound/oss/kahlua.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-01 12:38:49 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-01 12:38:49 +0100
commit12c2a682b55a40f2a986e36d6632110029bc63a5 (patch)
treeba21f049e4859411f6c135d597dc26260963ce7c /sound/oss/kahlua.c
parenta86ba28583987b85845ed61be5f12aafb5fc4971 (diff)
parentaefbd3e823d4fe219bb6420b0cac505847270507 (diff)
downloadkernel-crypto-12c2a682b55a40f2a986e36d6632110029bc63a5.tar.gz
kernel-crypto-12c2a682b55a40f2a986e36d6632110029bc63a5.tar.xz
kernel-crypto-12c2a682b55a40f2a986e36d6632110029bc63a5.zip
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/kahlua.c')
-rw-r--r--sound/oss/kahlua.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index 89466b056be..24d152ccf80 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -198,7 +198,7 @@ MODULE_LICENSE("GPL");
* 5530 only. The 5510/5520 decode is different.
*/
-static struct pci_device_id id_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(id_tbl) = {
{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 },
{ }
};