diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:01:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:01:25 +0100 |
| commit | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (patch) | |
| tree | 415aefe6d168df27c006fcc53b1ea5242eabaaea /include/scsi/scsi_host.h | |
| parent | x86: remove bogus 'pci=usepirqmask' suggestion when no irq is defined (diff) | |
| parent | [SCSI] scsi_end_async() needs to take an uptodate parameter (diff) | |
| download | linux-d99cf9d679a520d67f81d805b7cb91c68e1847f0.tar.xz linux-d99cf9d679a520d67f81d805b7cb91c68e1847f0.zip | |
Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block
Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b847548663ef1039dd49f0eb4463d001e596bc3.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/scsi/scsi_host.h')
| -rw-r--r-- | include/scsi/scsi_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 6297885a35e7..230bc55c0bfa 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -398,7 +398,6 @@ struct scsi_host_template { /* * ordered write support */ - unsigned ordered_flush:1; unsigned ordered_tag:1; /* |