diff options
| author | Paul Mackerras <paulus@samba.org> | 2003-05-25 15:50:18 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2003-05-25 15:50:18 +1000 |
| commit | 523f88f11c3cdeecc2abf7ca293f22dca890ed7f (patch) | |
| tree | 7dbe87db71b79e10bb3327174b099368ff9d47cd /include/linux/ide.h | |
| parent | 4c276cb8a7cc89e529b5867e6f5d7e9bb33ba72b (diff) | |
| parent | e3c76cab5ffd6d26c77d694633c5d0c24f395a8d (diff) | |
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 5 |
1 files changed, 5 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. |