git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
sound
/
pci
/
ice1712
/
ice1724.c
diff --git
a/sound/pci/ice1712/ice1724.c
b/sound/pci/ice1712/ice1724.c
index
36ade77
..
cc84a83
100644
(file)
--- a/
sound/pci/ice1712/ice1724.c
+++ b/
sound/pci/ice1712/ice1724.c
@@
-93,7
+93,7
@@
MODULE_PARM_DESC(model, "Use the given board model.");
/* Both VT1720 and VT1724 have the same PCI IDs */
static const struct pci_device_id snd_vt1724_ids[] = {
- { PCI_V
ENDOR_ID_ICE, PCI_DEVICE_ID_VT1724, PCI_ANY_ID, PCI_ANY_ID, 0, 0
, 0 },
+ { PCI_V
DEVICE(ICE, PCI_DEVICE_ID_VT1724)
, 0 },
{ 0, }
};