diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:16:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:16:50 -0400 |
| commit | 586a4ac509b041df55f26c2b26cd7cbdaf9b045d (patch) | |
| tree | dd91fe472070836465da7901f22869b54b2999b8 /include/linux | |
| parent | [libata] update several drivers to use pci_iomap()/pci_iounmap() (diff) | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git (diff) | |
| download | linux-dev-586a4ac509b041df55f26c2b26cd7cbdaf9b045d.tar.xz linux-dev-586a4ac509b041df55f26c2b26cd7cbdaf9b045d.zip | |
/spare/repo/libata-dev branch 'master'
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 @@ #define PCI_DEVICE_ID_ENE_1225 0x1225 #define PCI_DEVICE_ID_ENE_1410 0x1410 #define PCI_DEVICE_ID_ENE_1420 0x1420 +#define PCI_VENDOR_ID_CHELSIO 0x1425 #define PCI_VENDOR_ID_SYBA 0x1592 #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 @@ * Sound core interface functions */ +struct device; extern int register_sound_special(struct file_operations *fops, int unit); +extern int register_sound_special_device(struct file_operations *fops, int unit, struct device *dev); extern int register_sound_mixer(struct file_operations *fops, int dev); extern int register_sound_midi(struct file_operations *fops, int dev); extern int register_sound_dsp(struct file_operations *fops, int dev); |