mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
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
This commit is contained in:
commit
35ad1c8803
43 changed files with 92 additions and 116 deletions
|
|
@ -26,8 +26,6 @@
|
|||
* (http://www.freecom.de/)
|
||||
*/
|
||||
|
||||
#include <linux/hdreg.h>
|
||||
|
||||
#include <scsi/scsi.h>
|
||||
#include <scsi/scsi_cmnd.h>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue