diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 20:22:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 20:22:31 -0400 |
| commit | 8bd51cce98aa80ff8b56d34a0e48316c5f887818 (patch) | |
| tree | 76735fa7f5767fa379f30399a9bd048a3bbf3fc3 /include | |
| parent | 9631eb0bc18bc1fd1cc84e535260d67ed6a36865 (diff) | |
| parent | a7a832de9e9624bcf069a5369c3c38ba2f44d460 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: add "optical" to sysfs "media" attribute
ide: ugly messages trying to open CD drive with no media present
ide: correctly prevent IDE timer expiry function to run if request was already handled
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 58564a199862..d3bbc7188b6a 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -861,6 +861,8 @@ typedef struct hwgroup_s { | |||
| 861 | int (*expiry)(ide_drive_t *); | 861 | int (*expiry)(ide_drive_t *); |
| 862 | /* ide_system_bus_speed */ | 862 | /* ide_system_bus_speed */ |
| 863 | int pio_clock; | 863 | int pio_clock; |
| 864 | int req_gen; | ||
| 865 | int req_gen_timer; | ||
| 864 | 866 | ||
| 865 | unsigned char cmd_buf[4]; | 867 | unsigned char cmd_buf[4]; |
| 866 | } ide_hwgroup_t; | 868 | } ide_hwgroup_t; |