1 files changed, 3 insertions, 17 deletions

diff --git a/drivers/media/platform/omap3isp/ispreg.h b/drivers/media/platform/omap3isp/ispreg.h
index b7d90e6fb01d..b5ea8da0b904 100644
--- a/drivers/media/platform/omap3isp/ispreg.h
+++ b/drivers/media/platform/omap3isp/ispreg.h
@@ -12,16 +12,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
  */
 
 #ifndef OMAP3_ISP_REG_H
@@ -740,17 +730,13 @@
 
 #define ISPCCDC_HSIZE_OFF_SHIFT                 0
 
-#define ISPCCDC_SDOFST_FINV                     (1 << 14)
-#define ISPCCDC_SDOFST_FOFST_1L                 0
-#define ISPCCDC_SDOFST_FOFST_4L                 (3 << 12)
+#define ISPCCDC_SDOFST_FIINV                    (1 << 14)
+#define ISPCCDC_SDOFST_FOFST_SHIFT              12
+#define ISPCCDC_SDOFST_FOFST_MASK               (3 << 12)
 #define ISPCCDC_SDOFST_LOFST3_SHIFT             0
 #define ISPCCDC_SDOFST_LOFST2_SHIFT             3
 #define ISPCCDC_SDOFST_LOFST1_SHIFT             6
 #define ISPCCDC_SDOFST_LOFST0_SHIFT             9
-#define EVENEVEN                                1
-#define ODDEVEN                                 2
-#define EVENODD                                 3
-#define ODDODD                                  4
 
 #define ISPCCDC_CLAMP_OBGAIN_SHIFT              0
 #define ISPCCDC_CLAMP_OBST_SHIFT                10