summaryrefslogtreecommitdiffstats
path: root/sound/pci/echoaudio/indigodjx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-10 15:02:37 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-10 15:02:37 +0000
commitfad837c16cdd856c68ce2e1335ad0fe836ed8ecd (patch)
tree1a6babdc2ac7e5388c482e93505fdfaf5ff97f61 /sound/pci/echoaudio/indigodjx.c
parent51c6ab130642ed975681df843c772dda48a1d2ed (diff)
parent57d54889cd00db2752994b389ba714138652e60c (diff)
downloadblackbird-op-linux-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.tar.gz
blackbird-op-linux-fad837c16cdd856c68ce2e1335ad0fe836ed8ecd.zip
Merge commit 'v2.6.34-rc1' into for-2.6.35
Diffstat (limited to 'sound/pci/echoaudio/indigodjx.c')
-rw-r--r--sound/pci/echoaudio/indigodjx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c
index 2e44316530a2..b1e3652f2f48 100644
--- a/sound/pci/echoaudio/indigodjx.c
+++ b/sound/pci/echoaudio/indigodjx.c
@@ -68,7 +68,7 @@ static const struct firmware card_fw[] = {
{0, "indigo_djx_dsp.fw"}
};
-static struct pci_device_id snd_echo_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
{0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0}, /* Indigo DJx*/
{0,}
};
OpenPOWER on IntegriCloud