diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /drivers/scsi/scsi_ioctl.c | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
| -rw-r--r-- | drivers/scsi/scsi_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index a89aff61d3d8..a89c4115cfba 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c | |||
| @@ -15,11 +15,11 @@ | |||
| 15 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
| 16 | 16 | ||
| 17 | #include <scsi/scsi.h> | 17 | #include <scsi/scsi.h> |
| 18 | #include <scsi/scsi_cmnd.h> | ||
| 18 | #include <scsi/scsi_device.h> | 19 | #include <scsi/scsi_device.h> |
| 19 | #include <scsi/scsi_eh.h> | 20 | #include <scsi/scsi_eh.h> |
| 20 | #include <scsi/scsi_host.h> | 21 | #include <scsi/scsi_host.h> |
| 21 | #include <scsi/scsi_ioctl.h> | 22 | #include <scsi/scsi_ioctl.h> |
| 22 | #include <scsi/scsi_request.h> | ||
| 23 | #include <scsi/sg.h> | 23 | #include <scsi/sg.h> |
| 24 | #include <scsi/scsi_dbg.h> | 24 | #include <scsi/scsi_dbg.h> |
| 25 | 25 | ||