summaryrefslogtreecommitdiff
path: root/sm8150/kernel-headers/drm
diff options
context:
space:
mode:
authorDaniel Mentz <danielmentz@google.com>2019-04-04 12:56:07 -0700
committerDaniel Mentz <danielmentz@google.com>2019-04-05 22:36:38 +0000
commitfe462b1104b86bf7e0980e9984266f7e9d28c7f9 (patch)
tree4e8b52424cbc8b17b2a0e823761921545c3182d9 /sm8150/kernel-headers/drm
parent1191698e332ba11c3dc2eb8fa03f292f9d718cdb (diff)
downloadcoral-kernel-fe462b1104b86bf7e0980e9984266f7e9d28c7f9.tar.gz
Clean up and update kernel headers
Performed various clean up operations. Remove stray files: linux/mfd/Kbuild linux/mfd/wcd9xxx/Kbuild Remove extraneous new line character at the end of the header file. See also aosp/936633 (most if not all files affected) Files not previously run through "make headers_install" linux/avtimer.h linux/msm_audio.h linux/msm_audio_aac.h linux/msm_audio_ac3.h linux/msm_audio_alac.h linux/msm_audio_amrnb.h linux/msm_audio_amrwb.h linux/msm_audio_amrwbplus.h linux/msm_audio_ape.h linux/msm_audio_calibration.h linux/msm_audio_g711.h linux/msm_audio_g711_dec.h linux/msm_audio_mvs.h linux/msm_audio_qcp.h linux/msm_audio_sbc.h linux/msm_audio_voicememo.h linux/msm_audio_wma.h linux/msm_audio_wmapro.h sound/asound.h sound/audio_effects.h sound/devdep_params.h sound/lsm_params.h sound/msmcal-hwdep.h Files not previously run through clean_header.py sound/asound.h Regular updates linux/ab-sm.h linux/avtimer.h linux/mfd/Kbuild linux/mfd/wcd9xxx/Kbuild linux/msm_audio.h linux/msm_audio_aac.h linux/msm_audio_ac3.h linux/msm_audio_alac.h linux/msm_audio_amrnb.h linux/msm_audio_amrwb.h linux/msm_audio_amrwbplus.h linux/msm_audio_ape.h linux/msm_audio_calibration.h linux/msm_audio_g711.h linux/msm_audio_g711_dec.h linux/msm_audio_mvs.h linux/msm_audio_qcp.h linux/msm_audio_sbc.h linux/msm_audio_voicememo.h linux/msm_audio_wma.h linux/msm_audio_wmapro.h sound/asound.h Bug: 129721165 Change-Id: I6beb3aa85c57347a01f25608ec77a40a4b297686
Diffstat (limited to 'sm8150/kernel-headers/drm')
-rw-r--r--sm8150/kernel-headers/drm/drm_fourcc.h3
-rw-r--r--sm8150/kernel-headers/drm/msm_drm.h3
-rw-r--r--sm8150/kernel-headers/drm/msm_drm_pp.h1
-rw-r--r--sm8150/kernel-headers/drm/sde_drm.h1
4 files changed, 4 insertions, 4 deletions
diff --git a/sm8150/kernel-headers/drm/drm_fourcc.h b/sm8150/kernel-headers/drm/drm_fourcc.h
index 27197ae76..a178ca3ba 100644
--- a/sm8150/kernel-headers/drm/drm_fourcc.h
+++ b/sm8150/kernel-headers/drm/drm_fourcc.h
@@ -20,6 +20,7 @@
#define DRM_FOURCC_H
#include "drm.h"
#ifdef __cplusplus
+extern "C" {
#endif
#define fourcc_code(a,b,c,d) ((__u32) (a) | ((__u32) (b) << 8) | ((__u32) (c) << 16) | ((__u32) (d) << 24))
#define DRM_FORMAT_BIG_ENDIAN (1 << 31)
@@ -132,6 +133,6 @@
#define NV_FORMAT_MOD_TEGRA_16BX2_BLOCK(v) fourcc_mod_tegra_code(2, v)
#define DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED fourcc_mod_code(BROADCOM, 1)
#ifdef __cplusplus
+}
#endif
#endif
-
diff --git a/sm8150/kernel-headers/drm/msm_drm.h b/sm8150/kernel-headers/drm/msm_drm.h
index 7e657a2a7..8a6c5095c 100644
--- a/sm8150/kernel-headers/drm/msm_drm.h
+++ b/sm8150/kernel-headers/drm/msm_drm.h
@@ -21,6 +21,7 @@
#include "drm.h"
#include "sde_drm.h"
#ifdef __cplusplus
+extern "C" {
#endif
#define MSM_PIPE_NONE 0x00
#define MSM_PIPE_2D0 0x01
@@ -220,6 +221,6 @@ struct drm_msm_event_resp {
#define DRM_IOCTL_MSM_DEREGISTER_EVENT DRM_IOW((DRM_COMMAND_BASE + DRM_MSM_DEREGISTER_EVENT), struct drm_msm_event_req)
#define DRM_IOCTL_MSM_RMFB2 DRM_IOW((DRM_COMMAND_BASE + DRM_MSM_RMFB2), unsigned int)
#ifdef __cplusplus
+}
#endif
#endif
-
diff --git a/sm8150/kernel-headers/drm/msm_drm_pp.h b/sm8150/kernel-headers/drm/msm_drm_pp.h
index ff5a50447..445bc87b2 100644
--- a/sm8150/kernel-headers/drm/msm_drm_pp.h
+++ b/sm8150/kernel-headers/drm/msm_drm_pp.h
@@ -308,4 +308,3 @@ struct drm_msm_ad4_manual_str_cfg {
__u32 out_str;
};
#endif
-
diff --git a/sm8150/kernel-headers/drm/sde_drm.h b/sm8150/kernel-headers/drm/sde_drm.h
index 734f01384..7fb1c3493 100644
--- a/sm8150/kernel-headers/drm/sde_drm.h
+++ b/sm8150/kernel-headers/drm/sde_drm.h
@@ -184,4 +184,3 @@ struct sde_drm_roi_v1 {
#define SDE_RECOVERY_CAPTURE 1
#define SDE_RECOVERY_HARD_RESET 2
#endif
-