~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to sound/pci/echoaudio/indigoio.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
#include <linux/init.h>
44
44
#include <linux/interrupt.h>
45
45
#include <linux/pci.h>
46
 
#include <linux/slab.h>
47
46
#include <linux/moduleparam.h>
48
47
#include <linux/firmware.h>
 
48
#include <linux/slab.h>
49
49
#include <sound/core.h>
50
50
#include <sound/info.h>
51
51
#include <sound/control.h>
69
69
        {0, "indigo_io_dsp.fw"}
70
70
};
71
71
 
72
 
static struct pci_device_id snd_echo_ids[] = {
 
72
static DEFINE_PCI_DEVICE_TABLE(snd_echo_ids) = {
73
73
        {0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0},      /* Indigo IO*/
74
74
        {0,}
75
75
};