summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2016-10-25 21:46:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-25 21:46:40 +0000
commitd0fceae1022037f742e5bafbac4365a2347982c5 (patch)
tree3f3c608f40e4b1827fcf5c32f974e3f13c5e2d1f
parentbea2b560229f4d9ef6c5129b29c7511b771183c6 (diff)
parente9672e66f1ca94cecc6d856d75aed75c603aea01 (diff)
downloadmsm8996-d0fceae1022037f742e5bafbac4365a2347982c5.tar.gz
am: e9672e66f1 Change-Id: I2cf7ae244dc80aa6cd7aa3f2b710a88239168b3a
-rw-r--r--kernel-headers/media/msmb_ispif.h2
-rw-r--r--original-kernel-headers/media/msmb_ispif.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel-headers/media/msmb_ispif.h b/kernel-headers/media/msmb_ispif.h
index 4dc97ee..f5d73df 100644
--- a/kernel-headers/media/msmb_ispif.h
+++ b/kernel-headers/media/msmb_ispif.h
@@ -132,7 +132,7 @@ enum ispif_cfg_type_t {
ISPIF_CFG,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
ISPIF_START_FRAME_BOUNDARY,
- ISPIF_RESTART_FRAME_BOUNDARY,
+ ISPIF_RECONFIG,
ISPIF_STOP_FRAME_BOUNDARY,
ISPIF_STOP_IMMEDIATELY,
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
diff --git a/original-kernel-headers/media/msmb_ispif.h b/original-kernel-headers/media/msmb_ispif.h
index 26bd8a2..7d4e489 100644
--- a/original-kernel-headers/media/msmb_ispif.h
+++ b/original-kernel-headers/media/msmb_ispif.h
@@ -105,7 +105,7 @@ enum ispif_cfg_type_t {
ISPIF_INIT,
ISPIF_CFG,
ISPIF_START_FRAME_BOUNDARY,
- ISPIF_RESTART_FRAME_BOUNDARY,
+ ISPIF_RECONFIG,
ISPIF_STOP_FRAME_BOUNDARY,
ISPIF_STOP_IMMEDIATELY,
ISPIF_RELEASE,