aboutsummaryrefslogtreecommitdiff
path: root/sound/oss/kahlua.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-09-03 16:57:41 +0200
committerTakashi Iwai <tiwai@suse.de>2014-09-03 16:57:41 +0200
commit05244d166739ae273fdc7a2151bdef61df49ca7d (patch)
tree9065482d33f445c90f0b99d29aa51485d1d96488 /sound/oss/kahlua.c
parentacf08081adb5e8fe0519eb97bb49797ef52614d6 (diff)
parentf58f0cba15c2d0bfbc72b1eedd0a6294e8c83419 (diff)
downloadlinux-05244d166739ae273fdc7a2151bdef61df49ca7d.tar.gz
Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17 A few more driver specific fixes on top of the currently pending fixes (which are already in your tree but not 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 12be1fb512dd..c4b0434c7604 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -197,7 +197,7 @@ MODULE_LICENSE("GPL");
* 5530 only. The 5510/5520 decode is different.
*/
-static DEFINE_PCI_DEVICE_TABLE(id_tbl) = {
+static const struct pci_device_id id_tbl[] = {
{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 },
{ }
};