diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:20:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-05 05:20:33 -0400 |
| commit | d0bd99299bf933ae006d2dc6a31ffcba482ae3f2 (patch) | |
| tree | 62615ed8bc6ab68f42b59d412a7fd7ac77c79803 /include/linux | |
| parent | 6f1062330499cee10396bf3fc66a03eb228c5fad (diff) | |
| parent | 586a4ac509b041df55f26c2b26cd7cbdaf9b045d (diff) | |
| download | op-kernel-dev-d0bd99299bf933ae006d2dc6a31ffcba482ae3f2.zip op-kernel-dev-d0bd99299bf933ae006d2dc6a31ffcba482ae3f2.tar.gz | |
/spare/repo/libata-dev branch 'iomap-try3'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 1 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 | ||||
| -rw-r--r-- | include/linux/sound.h | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 1eaba40..022105c 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -449,6 +449,7 @@ struct pci_bits { unsigned long val; }; +extern void ata_pci_host_stop (struct ata_host_set *host_set); extern struct ata_probe_ent * ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port); extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 499a532..d513c16 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 428f597..72b9af4 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); |
