diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-03 10:57:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-03 10:57:41 -0400 |
| commit | 05244d166739ae273fdc7a2151bdef61df49ca7d (patch) | |
| tree | 9065482d33f445c90f0b99d29aa51485d1d96488 /sound/pci/asihpi/asihpi.c | |
| parent | acf08081adb5e8fe0519eb97bb49797ef52614d6 (diff) | |
| parent | f58f0cba15c2d0bfbc72b1eedd0a6294e8c83419 (diff) | |
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/pci/asihpi/asihpi.c')
| -rw-r--r-- | sound/pci/asihpi/asihpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c index 901c9490398a..5017176bfaa1 100644 --- a/sound/pci/asihpi/asihpi.c +++ b/sound/pci/asihpi/asihpi.c | |||
| @@ -2955,7 +2955,7 @@ static void snd_asihpi_remove(struct pci_dev *pci_dev) | |||
| 2955 | asihpi_adapter_remove(pci_dev); | 2955 | asihpi_adapter_remove(pci_dev); |
| 2956 | } | 2956 | } |
| 2957 | 2957 | ||
| 2958 | static DEFINE_PCI_DEVICE_TABLE(asihpi_pci_tbl) = { | 2958 | static const struct pci_device_id asihpi_pci_tbl[] = { |
| 2959 | {HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205, | 2959 | {HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205, |
| 2960 | HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0, | 2960 | HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0, |
| 2961 | (kernel_ulong_t)HPI_6205}, | 2961 | (kernel_ulong_t)HPI_6205}, |