diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-23 04:49:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-23 04:49:28 -0700 |
| commit | e3c76cab5ffd6d26c77d694633c5d0c24f395a8d (patch) | |
| tree | 0fd3903469bae72b49cc9f8861e10c7e517d3fdf /include/linux | |
| parent | 462bcde63abb49501d834fd5d0436ed38848e49a (diff) | |
| parent | 33322ec65ea41eb276051f09c4ac54c2e0d36dd2 (diff) | |
Merge http://linux-acpi.bkbits.net/linux-acpi
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 5 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index f773ff4268a9..a6166056977c 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -886,6 +886,8 @@ typedef struct hwif_s { struct pnp_dev *pnp_dev; /* for PnP devices */ + ide_startstop_t (*rw_disk)(ide_drive_t *, struct request *, sector_t); + #if 0 ide_hwif_ops_t *hwifops; #else @@ -1001,6 +1003,7 @@ typedef struct hwif_s { unsigned noprobe : 1; /* don't probe for this interface */ unsigned present : 1; /* this interface exists */ + unsigned hold : 1; /* this interface is always present */ unsigned serialized : 1; /* serialized all channel operation */ unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */ unsigned reset : 1; /* reset after probe */ @@ -1534,6 +1537,8 @@ extern u8 eighty_ninty_three (ide_drive_t *); extern int set_transfer(ide_drive_t *, ide_task_t *); extern int taskfile_lib_get_identify(ide_drive_t *drive, u8 *); +ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, sector_t block); + /* * ide_system_bus_speed() returns what we think is the system VESA/PCI * bus speed (in MHz). This is used for calculating interface PIO timings. diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 4c8f4240d33d..4f5fdde6dc4b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -557,6 +557,7 @@ #define PCI_DEVICE_ID_SI_650 0x0650 #define PCI_DEVICE_ID_SI_651 0x0651 #define PCI_DEVICE_ID_SI_652 0x0652 +#define PCI_DEVICE_ID_SI_655 0x0655 #define PCI_DEVICE_ID_SI_730 0x0730 #define PCI_DEVICE_ID_SI_630_VGA 0x6300 #define PCI_DEVICE_ID_SI_730_VGA 0x7300 @@ -1127,6 +1128,7 @@ #define PCI_DEVICE_ID_VIA_8753_0 0x3128 #define PCI_DEVICE_ID_VIA_8233A 0x3147 #define PCI_DEVICE_ID_VIA_8752 0x3148 +#define PCI_DEVICE_ID_VIA_8237_SATA 0x3149 #define PCI_DEVICE_ID_VIA_KN266 0x3156 #define PCI_DEVICE_ID_VIA_8754 0x3168 #define PCI_DEVICE_ID_VIA_8235 0x3177 @@ -1135,6 +1137,7 @@ #define PCI_DEVICE_ID_VIA_8377_0 0x3189 #define PCI_DEVICE_ID_VIA_KM400 0x3205 #define PCI_DEVICE_ID_VIA_P4M400 0x3209 +#define PCI_DEVICE_ID_VIA_8237 0x3227 #define PCI_DEVICE_ID_VIA_86C100A 0x6100 #define PCI_DEVICE_ID_VIA_8231 0x8231 #define PCI_DEVICE_ID_VIA_8231_4 0x8235 @@ -1893,6 +1896,7 @@ #define PCI_DEVICE_ID_INTEL_82801DB_12 0x24cc #define PCI_DEVICE_ID_INTEL_82801DB_13 0x24cd #define PCI_DEVICE_ID_INTEL_82801EB_0 0x24d0 +#define PCI_DEVICE_ID_INTEL_82801EB_1 0x24d1 #define PCI_DEVICE_ID_INTEL_82801EB_2 0x24d2 #define PCI_DEVICE_ID_INTEL_82801EB_3 0x24d3 #define PCI_DEVICE_ID_INTEL_82801EB_4 0x24d4 |