diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pci_ids.h | 1 | ||||
| -rw-r--r-- | include/linux/sound.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 499a5325f67f..d513c1634006 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2145,6 +2145,7 @@ | |||
| 2145 | #define PCI_DEVICE_ID_ENE_1225 0x1225 | 2145 | #define PCI_DEVICE_ID_ENE_1225 0x1225 |
| 2146 | #define PCI_DEVICE_ID_ENE_1410 0x1410 | 2146 | #define PCI_DEVICE_ID_ENE_1410 0x1410 |
| 2147 | #define PCI_DEVICE_ID_ENE_1420 0x1420 | 2147 | #define PCI_DEVICE_ID_ENE_1420 0x1420 |
| 2148 | #define PCI_VENDOR_ID_CHELSIO 0x1425 | ||
| 2148 | 2149 | ||
| 2149 | #define PCI_VENDOR_ID_SYBA 0x1592 | 2150 | #define PCI_VENDOR_ID_SYBA 0x1592 |
| 2150 | #define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 | 2151 | #define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 |
diff --git a/include/linux/sound.h b/include/linux/sound.h index 428f59794f48..72b9af4c3fd4 100644 --- a/include/linux/sound.h +++ b/include/linux/sound.h | |||
| @@ -29,7 +29,9 @@ | |||
| 29 | * Sound core interface functions | 29 | * Sound core interface functions |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | struct device; | ||
| 32 | extern int register_sound_special(struct file_operations *fops, int unit); | 33 | extern int register_sound_special(struct file_operations *fops, int unit); |
| 34 | extern int register_sound_special_device(struct file_operations *fops, int unit, struct device *dev); | ||
| 33 | extern int register_sound_mixer(struct file_operations *fops, int dev); | 35 | extern int register_sound_mixer(struct file_operations *fops, int dev); |
| 34 | extern int register_sound_midi(struct file_operations *fops, int dev); | 36 | extern int register_sound_midi(struct file_operations *fops, int dev); |
| 35 | extern int register_sound_dsp(struct file_operations *fops, int dev); | 37 | extern int register_sound_dsp(struct file_operations *fops, int dev); |
