diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:27 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:27 -0400 |
| commit | e618a5609e504845786c71e2825e10b6a9728185 (patch) | |
| tree | 6c9e1a40216b776923567f9b3506a8fee66dec89 /include | |
| parent | d3e3743694cbfd64450b3468e11b40ba8c6f4369 (diff) | |
| parent | a5990dc5b96f537618b0f057c8723a6a0b0cdc74 (diff) | |
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi: (35 commits)
ALSA: ctxfi - Clear PCM resources at hw_params and hw_free
ALSA: ctxfi - Check the presence of SRC instance in PCM pointer callbacks
ALSA: ctxfi - Add missing start check in atc_pcm_playback_start()
ALSA: ctxfi - Add use_system_timer module option
ALSA: ctxfi - Fix wrong model id for UAA
ALSA: ctxfi - Clean up probe routines
ALSA: ctxfi - Fix / clean up hw20k2 chip code
ALSA: ctxfi - Fix possible buffer pointer overrun
ALSA: ctxfi - Remove useless initializations and cast
ALSA: ctxfi - Fix DMA mask for emu20k2 chip
ALSA: ctxfi - Make volume controls more intuitive
ALSA: ctxfi - Optimize the native timer handling using wc counter
ALSA: ctxfi - Add missing inclusion of linux/math64.h
ALSA: ctxfi - Set device 0 for mixer control elements
ALSA: ctxfi - Clean up / optimize
ALSA: ctxfi - Set periods_min to 2
ALSA: ctxfi - Use native timer interrupt on emu20k1
ALSA: ctxfi - Fix previous fix for 64bit DMA
ALSA: ctxfi - Fix endian-dependent codes
ALSA: ctxfi - Allow 64bit DMA
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 0f71812d67d3..36b8ff9fe259 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1314,6 +1314,13 @@ | |||
| 1314 | 1314 | ||
| 1315 | #define PCI_VENDOR_ID_CREATIVE 0x1102 /* duplicate: ECTIVA */ | 1315 | #define PCI_VENDOR_ID_CREATIVE 0x1102 /* duplicate: ECTIVA */ |
| 1316 | #define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002 | 1316 | #define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002 |
| 1317 | #define PCI_DEVICE_ID_CREATIVE_20K1 0x0005 | ||
| 1318 | #define PCI_DEVICE_ID_CREATIVE_20K2 0x000b | ||
| 1319 | #define PCI_SUBDEVICE_ID_CREATIVE_SB0760 0x0024 | ||
| 1320 | #define PCI_SUBDEVICE_ID_CREATIVE_SB08801 0x0041 | ||
| 1321 | #define PCI_SUBDEVICE_ID_CREATIVE_SB08802 0x0042 | ||
| 1322 | #define PCI_SUBDEVICE_ID_CREATIVE_SB08803 0x0043 | ||
| 1323 | #define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX 0x6000 | ||
| 1317 | 1324 | ||
| 1318 | #define PCI_VENDOR_ID_ECTIVA 0x1102 /* duplicate: CREATIVE */ | 1325 | #define PCI_VENDOR_ID_ECTIVA 0x1102 /* duplicate: CREATIVE */ |
| 1319 | #define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938 | 1326 | #define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938 |