[media] omap3isp: Fix compilation error in ispreg.h
authorIdo Yariv <ido@wizery.com>
Mon, 1 Oct 2012 21:46:27 +0000 (18:46 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 7 Oct 2012 13:14:13 +0000 (10:14 -0300)
Commit c49f34bc ("ARM: OMAP2+ Move SoC specific headers to be local to
mach-omap2") moved omap34xx.h to mach-omap2. This broke omap3isp, as it
includes omap34xx.h.
Instead of moving omap34xx to platform_data, simply add the two
definitions the driver needs and remove the include altogether.

Signed-off-by: Ido Yariv <ido@wizery.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/omap3isp/ispreg.h

index 084ea77..e2c57f3 100644 (file)
 #ifndef OMAP3_ISP_REG_H
 #define OMAP3_ISP_REG_H
 
-#include <plat/omap34xx.h>
-
-
 #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))