Skip to content

Commit

Permalink
[media] omap3isp: Fix compilation error in ispreg.h
Browse files Browse the repository at this point in the history
Commit c49f34b ("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>
  • Loading branch information
Ido Yariv authored and Mauro Carvalho Chehab committed Oct 7, 2012
1 parent b45681a commit 8a18382
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/media/platform/omap3isp/ispreg.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
#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))

Expand Down

0 comments on commit 8a18382

Please sign in to comment.