Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07342d62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git

parents d4a1a732 e4862fed

drivers/s390/scsi/zfcp_aux.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline int zfcp_sg_list_copy_from_user(struct zfcp_sg_list *, 
static inline int zfcp_sg_list_copy_to_user(void __user *,

					    struct zfcp_sg_list *, size_t);



static int zfcp_cfdc_dev_ioctl(struct file *, unsigned int, unsigned long);

static long zfcp_cfdc_dev_ioctl(struct file *, unsigned int, unsigned long);



#define ZFCP_CFDC_IOC_MAGIC                     0xDD

#define ZFCP_CFDC_IOC \

drivers/s390/scsi/zfcp_def.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
#include <linux/mempool.h>

#include <linux/syscalls.h>

#include <linux/ioctl.h>

#include <linux/ioctl32.h>



/************************ DEBUG FLAGS *****************************************/

drivers/scsi/aacraid/linit.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static int aac_cfg_open(struct inode *inode, struct file *file) 
		}

	}



	return 0;

	return err;

}



/**

drivers/scsi/aic7xxx/aic7xxx_osm.c

+0 −2
Original line number Diff line number Diff line
@@ -2335,8 +2335,6 @@ ahc_linux_free_target(struct ahc_softc *ahc, struct ahc_linux_target *targ) 
		      AHC_TRANS_GOAL, /*paused*/FALSE);

	ahc_update_neg_request(ahc, &devinfo, tstate, tinfo, AHC_NEG_ALWAYS);

	ahc->platform_data->targets[target_offset] = NULL;

	if (targ->inq_data != NULL)

		free(targ->inq_data, M_DEVBUF);

	free(targ, M_DEVBUF);

}

drivers/scsi/aic7xxx/aic7xxx_osm.h

+0 −6
Original line number Diff line number Diff line
@@ -423,10 +423,6 @@ struct ahc_linux_device { 
	struct			ahc_linux_target *target;

};



typedef enum {

	AHC_INQ_VALID		 = 0x02,

} ahc_linux_targ_flags;



struct ahc_linux_target {

	struct ahc_linux_device	 *devices[AHC_NUM_LUNS];

	int			  channel;
@@ -434,8 +430,6 @@ struct ahc_linux_target { 
	int			  refcount;

	struct ahc_transinfo	  last_tinfo;

	struct ahc_softc	 *ahc;

	ahc_linux_targ_flags	  flags;

	struct scsi_inquiry_data *inq_data;

};



/********************* Definitions Required by the Core ***********************/