diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/scsi/scsi.h | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/scsi.h')
| -rw-r--r-- | drivers/scsi/scsi.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h index f51e466893e7..d5a55fae60e0 100644 --- a/drivers/scsi/scsi.h +++ b/drivers/scsi/scsi.h | |||
| @@ -20,8 +20,6 @@ | |||
| 20 | #ifndef _SCSI_H | 20 | #ifndef _SCSI_H |
| 21 | #define _SCSI_H | 21 | #define _SCSI_H |
| 22 | 22 | ||
| 23 | #include <linux/config.h> /* for CONFIG_SCSI_LOGGING */ | ||
| 24 | |||
| 25 | #include <scsi/scsi_cmnd.h> | 23 | #include <scsi/scsi_cmnd.h> |
| 26 | #include <scsi/scsi_device.h> | 24 | #include <scsi/scsi_device.h> |
| 27 | #include <scsi/scsi_eh.h> | 25 | #include <scsi/scsi_eh.h> |