commit fb2460b616379e075a42ef6be0ca4d6723d36239
author Dima Zavin <dima@android.com> Mon Apr 09 10:44:16 2012 -0700
committer Dima Zavin <dima@android.com> Mon Apr 09 10:44:16 2012 -0700
tree 242b54c9a887fa75ef7e405ddef7a4e19eb0bd15
parent 7bdb6bb07d8f9f751ead7fd8f5b39149670923f1

do not declare v4l2_preemphasis. it's part of core videodev2.h

Change-Id: I42002f544e069eddc2df3a2e16f53bca30da827f
Signed-off-by: Dima Zavin <dima@android.com>

tools/FM/service/src/jni/JFmTxNative.h

diff --git a/tools/FM/service/src/jni/JFmTxNative.h b/tools/FM/service/src/jni/JFmTxNative.h
index 24bc455..87fa2f5 100644
--- a/tools/FM/service/src/jni/JFmTxNative.h
+++ b/tools/FM/service/src/jni/JFmTxNative.h
@@ -179,11 +179,6 @@
 #define V4L2_CID_FM_TX_CLASS                    (V4L2_CTRL_CLASS_FM_TX | 1)
 
 #define V4L2_CID_TUNE_PREEMPHASIS               (V4L2_CID_FM_TX_CLASS_BASE + 112)
-enum v4l2_preemphasis {
-	V4L2_PREEMPHASIS_DISABLED       = 0,
-	V4L2_PREEMPHASIS_50_uS          = 1,
-	V4L2_PREEMPHASIS_75_uS          = 2,
-};
 
 #define V4L2_CID_RDS_TX_DEVIATION               (V4L2_CID_FM_TX_CLASS_BASE + 1)
 #define V4L2_CID_RDS_TX_PI                      (V4L2_CID_FM_TX_CLASS_BASE + 2)

tools/kfmapp/kfmapp.h

diff --git a/tools/kfmapp/kfmapp.h b/tools/kfmapp/kfmapp.h
index 1282498..0ad1f18 100644
--- a/tools/kfmapp/kfmapp.h
+++ b/tools/kfmapp/kfmapp.h
@@ -96,11 +96,6 @@
 #define V4L2_CID_FM_TX_CLASS                    (V4L2_CTRL_CLASS_FM_TX | 1)
 
 #define V4L2_CID_TUNE_PREEMPHASIS               (V4L2_CID_FM_TX_CLASS_BASE + 112)
-enum v4l2_preemphasis {
-        V4L2_PREEMPHASIS_DISABLED       = 0,
-        V4L2_PREEMPHASIS_50_uS          = 1,
-        V4L2_PREEMPHASIS_75_uS          = 2,
-};
 
 #define V4L2_CID_RDS_TX_DEVIATION               (V4L2_CID_FM_TX_CLASS_BASE + 1)
 #define V4L2_CID_RDS_TX_PI                      (V4L2_CID_FM_TX_CLASS_BASE + 2)