From 817d04f2276c966a5fd9c6068069413f2dd34910 Mon Sep 17 00:00:00 2001 From: Ido Yariv Date: Mon, 1 Oct 2012 18:46:27 -0300 Subject: [PATCH] --- yaml --- r: 333849 b: refs/heads/master c: 8a18382c3196978164f0f6290aac98f2f6f43c00 h: refs/heads/master i: 333847: f9cbd82121e71a306eaf063ccfc3ec223fd128fe v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/omap3isp/ispreg.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2fadaca97eaa..ca74307f8a5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b45681a60ed52b3716f3faf79f81e55b81bc7335 +refs/heads/master: 8a18382c3196978164f0f6290aac98f2f6f43c00 diff --git a/trunk/drivers/media/platform/omap3isp/ispreg.h b/trunk/drivers/media/platform/omap3isp/ispreg.h index 084ea77d65a7..e2c57f334c5d 100644 --- a/trunk/drivers/media/platform/omap3isp/ispreg.h +++ b/trunk/drivers/media/platform/omap3isp/ispreg.h @@ -27,13 +27,13 @@ #ifndef OMAP3_ISP_REG_H #define OMAP3_ISP_REG_H -#include - - #define CM_CAM_MCLK_HZ 172800000 /* Hz */ /* ISP Submodules offset */ +#define L4_34XX_BASE 0x48000000 +#define OMAP3430_ISP_BASE (L4_34XX_BASE + 0xBC000) + #define OMAP3ISP_REG_BASE OMAP3430_ISP_BASE #define OMAP3ISP_REG(offset) (OMAP3ISP_REG_BASE + (offset))