Merge branch 'topic/lx6464es' into for-linus
* topic/lx6464es: ALSA: Add missing description of lx6464es to ALSA-Configuration.txt ALSA: lx6464es - Disable lx_message_send() ALSA: lx6464es - Use snd_card_create() ALSA: lx6464es - driver for the digigram lx6464es interface
This commit is contained in:
@ -1005,6 +1005,7 @@
|
||||
#define PCI_DEVICE_ID_PLX_PCI200SYN 0x3196
|
||||
#define PCI_DEVICE_ID_PLX_9030 0x9030
|
||||
#define PCI_DEVICE_ID_PLX_9050 0x9050
|
||||
#define PCI_DEVICE_ID_PLX_9056 0x9056
|
||||
#define PCI_DEVICE_ID_PLX_9080 0x9080
|
||||
#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001
|
||||
|
||||
@ -1854,6 +1855,10 @@
|
||||
#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO 0x0107
|
||||
#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2 0x0108
|
||||
|
||||
#define PCI_VENDOR_ID_DIGIGRAM 0x1369
|
||||
#define PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM 0xc001
|
||||
#define PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM 0xc002
|
||||
|
||||
#define PCI_VENDOR_ID_KAWASAKI 0x136b
|
||||
#define PCI_DEVICE_ID_MCHIP_KL5A72002 0xff01
|
||||
|
||||
|
Reference in New Issue
Block a user