summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/hdcp
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2023-03-10 18:07:47 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-23 17:25:46 +0100
commit1fb1ea0d9cb8359ae9d6f67f22666c74d5b9f47d (patch)
tree4626a5fcb9e50547813f77ee65bf6740af3a5073 /drivers/misc/mei/hdcp
parentMerge 6.3-rc3 into char-misc-next (diff)
downloadlinux-1fb1ea0d9cb8359ae9d6f67f22666c74d5b9f47d.tar.xz
linux-1fb1ea0d9cb8359ae9d6f67f22666c74d5b9f47d.zip
mei: Move uuid.h to the MEI namespace
There is only a single user of the UUID uAPI, let's make it part of that user. The way it's done is to prevent compilation time breakage for the user space that does #include <linux/uuid.h> In the future MEI user space tools can switch over to use mei_uuid.h. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20230310170747.22782-1-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hdcp')
-rw-r--r--drivers/misc/mei/hdcp/mei_hdcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index e0dcd5c114db..45e3d4d27797 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -18,7 +18,7 @@
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/uuid.h>
+#include <linux/mei.h>
#include <linux/mei_cl_bus.h>
#include <linux/component.h>
#include <drm/drm_connector.h>