Merge branch 'master'

diff --cc drivers/scsi/libata-scsi.c
index 1ad75d5,5885888..b761bd1
--- 1/drivers/scsi/libata-scsi.c
--- 2/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@@ -45,11 -44,9 +45,11 @@@
  
  #include "libata.h"
  
- typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc, u8 *scsicmd);
 +#define SECTOR_SIZE   512
 +
+ typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc, const u8 *scsicmd);
  static struct ata_device *
- ata_scsi_find_dev(struct ata_port *ap, struct scsi_device *scsidev);
+ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev);
  
  
  static void ata_scsi_invalid_field(struct scsi_cmnd *cmd,

diff --cc drivers/scsi/libata.h
index 39cce63,3d60190..65c264b
--- 1/drivers/scsi/libata.h
--- 2/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@@ -48,10 -48,8 +48,10 @@@ extern int ata_qc_issue(struct ata_queu
  extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);
  extern void ata_dev_select(struct ata_port *ap, unsigned int device,
                             unsigned int wait, unsigned int can_sleep);
- extern void ata_tf_to_host_nolock(struct ata_port *ap, struct ata_taskfile *tf);
+ extern void ata_tf_to_host_nolock(struct ata_port *ap, const struct ata_taskfile *tf);
  extern void swap_buf_le16(u16 *buf, unsigned int buf_words);
 +extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg);
 +extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);
  
  
  /* libata-scsi.c */