diff options
author | Mark Brown | 2017-01-24 17:24:18 +0100 |
---|---|---|
committer | Mark Brown | 2017-01-24 17:24:18 +0100 |
commit | dbbc21bbf2c640dd148903e82f752c2f269fc58a (patch) | |
tree | e85f5b686774e2fbae6387f94bf44c4076c49046 /drivers/infiniband/ulp/iser/iscsi_iser.c | |
parent | ASoC: hdac_hdmi: use audio component framework to read ELD (diff) | |
parent | Linux 4.10-rc1 (diff) | |
download | kernel-qcow2-linux-dbbc21bbf2c640dd148903e82f752c2f269fc58a.tar.gz kernel-qcow2-linux-dbbc21bbf2c640dd148903e82f752c2f269fc58a.tar.xz kernel-qcow2-linux-dbbc21bbf2c640dd148903e82f752c2f269fc58a.zip |
Merge tag 'v4.10-rc1' into asoc-intel
Linux 4.10-rc1
Diffstat (limited to 'drivers/infiniband/ulp/iser/iscsi_iser.c')
-rw-r--r-- | drivers/infiniband/ulp/iser/iscsi_iser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index 64b3d11dcf1e..9104e6b8cac9 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c @@ -62,7 +62,7 @@ #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_device.h> |