commit d0fceae1022037f742e5bafbac4365a2347982c5
author Zhijun He <zhijunhe@google.com> Tue Oct 25 21:46:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 21:46:40 2016 +0000
tree 3f3c608f40e4b1827fcf5c32f974e3f13c5e2d1f
parent bea2b560229f4d9ef6c5129b29c7511b771183c6
parent e9672e66f1ca94cecc6d856d75aed75c603aea01

kernel headers: update for camera vfe recovery change am: 00948a642a
am: e9672e66f1

Change-Id: I2cf7ae244dc80aa6cd7aa3f2b710a88239168b3a

kernel-headers/media/msmb_ispif.h

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 @@
   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 */

original-kernel-headers/media/msmb_ispif.h

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 @@
 	ISPIF_INIT,
 	ISPIF_CFG,
 	ISPIF_START_FRAME_BOUNDARY,
-	ISPIF_RESTART_FRAME_BOUNDARY,
+	ISPIF_RECONFIG,
 	ISPIF_STOP_FRAME_BOUNDARY,
 	ISPIF_STOP_IMMEDIATELY,
 	ISPIF_RELEASE,