From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 28 Oct 2005 16:31:34 +0000 (-0400)
Subject: Merge branch 'master'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96b88fb850cc419171f926ad04650ec509e9f543;p=linux-beck.git

Merge branch 'master'
---

96b88fb850cc419171f926ad04650ec509e9f543
diff --cc drivers/scsi/libata-scsi.c
index 1ad75d58c30c,58858886d751..b761bd1b9717
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@@ -45,11 -44,9 +45,11 @@@
  
  #include "libata.h"
  
 +#define SECTOR_SIZE	512
 +
- typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc, u8 *scsicmd);
+ 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 39cce63dc45d,3d60190584ba..65c264b91136
--- a/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 */