diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:25:02 -0400 |
| commit | c1d9728ecc5b560465df3c0c0d3b3825c2710b40 (patch) | |
| tree | d0abb5c923a7a3eca2d4b2c3e1964bf484870909 /include/sound/ymfpci.h | |
| parent | 165415f700b0c77fa1f8db6198f48582639adf78 (diff) | |
| parent | 87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/sound/ymfpci.h')
| -rw-r--r-- | include/sound/ymfpci.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h index 9a3c1e6c820a..c3bccbfd8d4c 100644 --- a/include/sound/ymfpci.h +++ b/include/sound/ymfpci.h | |||
| @@ -28,28 +28,6 @@ | |||
| 28 | #include "timer.h" | 28 | #include "timer.h" |
| 29 | #include <linux/gameport.h> | 29 | #include <linux/gameport.h> |
| 30 | 30 | ||
| 31 | #ifndef PCI_VENDOR_ID_YAMAHA | ||
| 32 | #define PCI_VENDOR_ID_YAMAHA 0x1073 | ||
| 33 | #endif | ||
| 34 | #ifndef PCI_DEVICE_ID_YAMAHA_724 | ||
| 35 | #define PCI_DEVICE_ID_YAMAHA_724 0x0004 | ||
| 36 | #endif | ||
| 37 | #ifndef PCI_DEVICE_ID_YAMAHA_724F | ||
| 38 | #define PCI_DEVICE_ID_YAMAHA_724F 0x000d | ||
| 39 | #endif | ||
| 40 | #ifndef PCI_DEVICE_ID_YAMAHA_740 | ||
| 41 | #define PCI_DEVICE_ID_YAMAHA_740 0x000a | ||
| 42 | #endif | ||
| 43 | #ifndef PCI_DEVICE_ID_YAMAHA_740C | ||
| 44 | #define PCI_DEVICE_ID_YAMAHA_740C 0x000c | ||
| 45 | #endif | ||
| 46 | #ifndef PCI_DEVICE_ID_YAMAHA_744 | ||
| 47 | #define PCI_DEVICE_ID_YAMAHA_744 0x0010 | ||
| 48 | #endif | ||
| 49 | #ifndef PCI_DEVICE_ID_YAMAHA_754 | ||
| 50 | #define PCI_DEVICE_ID_YAMAHA_754 0x0012 | ||
| 51 | #endif | ||
| 52 | |||
| 53 | /* | 31 | /* |
| 54 | * Direct registers | 32 | * Direct registers |
| 55 | */ | 33 | */ |