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

Commit 2be7020b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UAPI: scsi: move the scsi ioctl related files" into msm-4.9

parents 6e0e625f 0e63486a
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@
header-y += fc/
header-y += ufs/
header-y += scsi_bsg_fc.h
header-y += sg.h
header-y += scsi_ioctl.h
header-y += scsi_netlink.h
header-y += scsi_netlink_fc.h
header-y += cxlflash_ioctl.h
+2 −0
Original line number Diff line number Diff line
#ifndef _SCSI_IOCTL_H
#define _SCSI_IOCTL_H 

#include <linux/types.h>

#define SCSI_IOCTL_SEND_COMMAND 1
#define SCSI_IOCTL_TEST_UNIT_READY 2
#define SCSI_IOCTL_BENCHMARK_COMMAND 3
+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
#define _SCSI_GENERIC_H

#include <linux/compiler.h>
#include <linux/param.h>

/*
 * History:
@@ -209,7 +210,6 @@ typedef struct sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */

/* Alternate style type names, "..._t" variants preferred */
typedef struct sg_io_hdr Sg_io_hdr;
typedef struct sg_io_vec Sg_io_vec;
typedef struct sg_scsi_id Sg_scsi_id;
typedef struct sg_req_info Sg_req_info;