summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-06 17:31:06 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-01-06 17:31:06 -0800
commitefbc57c0e6a92083fce03927736f5d389182935b (patch)
tree2e900ae80abfd296a6f0c0c3a7e6c1ae95ae2705 /include/uapi/linux
parent4b1af853646ca893fa686701d1605998fffcc82c (diff)
parent57c80e8e5d1cddae0651e5314394e6069ebbbe3c (diff)
downloadlwn-efbc57c0e6a92083fce03927736f5d389182935b.tar.gz
lwn-efbc57c0e6a92083fce03927736f5d389182935b.zip
Merge branch 'goodix' into next
Merge several improvements to Goodix touchscreen driver: - power management support - configuration upload - axis swapping and inversion
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/vfio.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 751b69f858c8..9fd7b5d8df2f 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -39,13 +39,6 @@
#define VFIO_SPAPR_TCE_v2_IOMMU 7
/*
- * The No-IOMMU IOMMU offers no translation or isolation for devices and
- * supports no ioctls outside of VFIO_CHECK_EXTENSION. Use of VFIO's No-IOMMU
- * code will taint the host kernel and should be used with extreme caution.
- */
-#define VFIO_NOIOMMU_IOMMU 8
-
-/*
* The IOCTL interface is designed for extensibility by embedding the
* structure length (argsz) and flags into structures passed between
* kernel and userspace. We therefore use the _IO() macro for these