diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 14:39:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 14:39:33 -0400 |
| commit | 35ad1c8803921b28541ad28bfb18dc3b6295ba98 (patch) | |
| tree | 998468e8bd42fab02d09bae8fc74bdf546608580 /drivers/usb | |
| parent | 580da34847488b404218d1d7f53b156f245f5555 (diff) | |
| parent | f454cbe8cd38b6d447e74ddaf012017fea42717e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: ->cable_detect method cannot be marked __devinit
ide: ->quirkproc method cannot be marked __devinit
cs5520: add enablebits checking
cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
ide-cd: fix endianity for the error message in cdrom_read_capacity
ide: remove CONFIG_IDE_MAX_HWIFS
remove unneeded #include <linux/ide.h>'s
ide: fix regression caused by ide_device_{get,put}() addition (take 2)
remove unnecessary <linux/hdreg.h> includes
ide: sanitize struct ide_port_ops documentation (take 2)
ide: fix ide_fix_driveid()
ide: fix pre-EIDE SWDMA support on big-endian
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/storage/freecom.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c index 7a4d45677227..73ac7262239e 100644 --- a/drivers/usb/storage/freecom.c +++ b/drivers/usb/storage/freecom.c | |||
| @@ -26,8 +26,6 @@ | |||
| 26 | * (http://www.freecom.de/) | 26 | * (http://www.freecom.de/) |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/hdreg.h> | ||
| 30 | |||
| 31 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
| 32 | #include <scsi/scsi_cmnd.h> | 30 | #include <scsi/scsi_cmnd.h> |
| 33 | 31 | ||