diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:34 +0200 |
| commit | 03cece06c41431ab71affc540d587e61894d7572 (patch) | |
| tree | b20f17531701edefd7bdc583344b3715b1c061f2 /include | |
| parent | 3c2fcf36d78d75eef46c2e39483ff8c3230ae335 (diff) | |
| parent | 8338c300642f67af5a8cc279ca5e088c7055b7eb (diff) | |
| download | op-kernel-dev-03cece06c41431ab71affc540d587e61894d7572.zip op-kernel-dev-03cece06c41431ab71affc540d587e61894d7572.tar.gz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 36b8ff9..28fe766 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -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 |
