From 8d6ec3bf3ced8f0603de9786cbae818e96099a5e Mon Sep 17 00:00:00 2001 From: Karthik Jayakumar Date: Fri, 1 Nov 2019 14:01:40 -0700 Subject: [PATCH] msm: camera: uapi: Add camera subfolder Added a camera subfolder for the UAPI headers to be located in. This prevents the camera UAPI headers from overwriting upstream kernel headers. CRs-Fixed: 2554484 Change-Id: Ie1edbfe585bbd428a6e5d1a40b438d22bd7c06c0 Signed-off-by: Karthik Jayakumar --- include/Kbuild | 2 -- include/uapi/Kbuild | 3 --- include/uapi/{ => camera}/media/cam_cpas.h | 0 include/uapi/{ => camera}/media/cam_custom.h | 0 include/uapi/{ => camera}/media/cam_defs.h | 0 include/uapi/{ => camera}/media/cam_fd.h | 0 include/uapi/{ => camera}/media/cam_icp.h | 0 include/uapi/{ => camera}/media/cam_isp.h | 0 include/uapi/{ => camera}/media/cam_isp_ife.h | 0 include/uapi/{ => camera}/media/cam_isp_vfe.h | 0 include/uapi/{ => camera}/media/cam_jpeg.h | 0 include/uapi/{ => camera}/media/cam_lrme.h | 0 include/uapi/{ => camera}/media/cam_req_mgr.h | 0 include/uapi/{ => camera}/media/cam_sensor.h | 0 include/uapi/{ => camera}/media/cam_sync.h | 0 include/uapi/media/Kbuild | 14 -------------- 16 files changed, 19 deletions(-) delete mode 100644 include/Kbuild delete mode 100644 include/uapi/Kbuild rename include/uapi/{ => camera}/media/cam_cpas.h (100%) rename include/uapi/{ => camera}/media/cam_custom.h (100%) rename include/uapi/{ => camera}/media/cam_defs.h (100%) rename include/uapi/{ => camera}/media/cam_fd.h (100%) rename include/uapi/{ => camera}/media/cam_icp.h (100%) rename include/uapi/{ => camera}/media/cam_isp.h (100%) rename include/uapi/{ => camera}/media/cam_isp_ife.h (100%) rename include/uapi/{ => camera}/media/cam_isp_vfe.h (100%) rename include/uapi/{ => camera}/media/cam_jpeg.h (100%) rename include/uapi/{ => camera}/media/cam_lrme.h (100%) rename include/uapi/{ => camera}/media/cam_req_mgr.h (100%) rename include/uapi/{ => camera}/media/cam_sensor.h (100%) rename include/uapi/{ => camera}/media/cam_sync.h (100%) delete mode 100644 include/uapi/media/Kbuild diff --git a/include/Kbuild b/include/Kbuild deleted file mode 100644 index bab1145bc7..0000000000 --- a/include/Kbuild +++ /dev/null @@ -1,2 +0,0 @@ -# Top-level Makefile calls into asm-$(ARCH) -# List only non-arch directories below diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild deleted file mode 100644 index 93dffc4bac..0000000000 --- a/include/uapi/Kbuild +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note - -header-y += media/ diff --git a/include/uapi/media/cam_cpas.h b/include/uapi/camera/media/cam_cpas.h similarity index 100% rename from include/uapi/media/cam_cpas.h rename to include/uapi/camera/media/cam_cpas.h diff --git a/include/uapi/media/cam_custom.h b/include/uapi/camera/media/cam_custom.h similarity index 100% rename from include/uapi/media/cam_custom.h rename to include/uapi/camera/media/cam_custom.h diff --git a/include/uapi/media/cam_defs.h b/include/uapi/camera/media/cam_defs.h similarity index 100% rename from include/uapi/media/cam_defs.h rename to include/uapi/camera/media/cam_defs.h diff --git a/include/uapi/media/cam_fd.h b/include/uapi/camera/media/cam_fd.h similarity index 100% rename from include/uapi/media/cam_fd.h rename to include/uapi/camera/media/cam_fd.h diff --git a/include/uapi/media/cam_icp.h b/include/uapi/camera/media/cam_icp.h similarity index 100% rename from include/uapi/media/cam_icp.h rename to include/uapi/camera/media/cam_icp.h diff --git a/include/uapi/media/cam_isp.h b/include/uapi/camera/media/cam_isp.h similarity index 100% rename from include/uapi/media/cam_isp.h rename to include/uapi/camera/media/cam_isp.h diff --git a/include/uapi/media/cam_isp_ife.h b/include/uapi/camera/media/cam_isp_ife.h similarity index 100% rename from include/uapi/media/cam_isp_ife.h rename to include/uapi/camera/media/cam_isp_ife.h diff --git a/include/uapi/media/cam_isp_vfe.h b/include/uapi/camera/media/cam_isp_vfe.h similarity index 100% rename from include/uapi/media/cam_isp_vfe.h rename to include/uapi/camera/media/cam_isp_vfe.h diff --git a/include/uapi/media/cam_jpeg.h b/include/uapi/camera/media/cam_jpeg.h similarity index 100% rename from include/uapi/media/cam_jpeg.h rename to include/uapi/camera/media/cam_jpeg.h diff --git a/include/uapi/media/cam_lrme.h b/include/uapi/camera/media/cam_lrme.h similarity index 100% rename from include/uapi/media/cam_lrme.h rename to include/uapi/camera/media/cam_lrme.h diff --git a/include/uapi/media/cam_req_mgr.h b/include/uapi/camera/media/cam_req_mgr.h similarity index 100% rename from include/uapi/media/cam_req_mgr.h rename to include/uapi/camera/media/cam_req_mgr.h diff --git a/include/uapi/media/cam_sensor.h b/include/uapi/camera/media/cam_sensor.h similarity index 100% rename from include/uapi/media/cam_sensor.h rename to include/uapi/camera/media/cam_sensor.h diff --git a/include/uapi/media/cam_sync.h b/include/uapi/camera/media/cam_sync.h similarity index 100% rename from include/uapi/media/cam_sync.h rename to include/uapi/camera/media/cam_sync.h diff --git a/include/uapi/media/Kbuild b/include/uapi/media/Kbuild deleted file mode 100644 index e7971dac10..0000000000 --- a/include/uapi/media/Kbuild +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note - -header-y += cam_cpas.h -header-y += cam_defs.h -header-y += cam_fd.h -header-y += cam_icp.h -header-y += cam_isp.h -header-y += cam_isp_vfe.h -header-y += cam_isp_ife.h -header-y += cam_jpeg.h -header-y += cam_req_mgr.h -header-y += cam_sensor.h -header-y += cam_sync.h -header-y += cam_lrme.h