Javier Martin 31e1a4e8b6 MX2: Fix mx2_camera clock regression. ...

The following patch breaks mx2_camera driver:
http://git.linuxtv.org/media_tree.git?a=commitdiff;h=52f1a845e25dc0c6435153aca1a170e20b282429

This change fixes the problem.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

2012-04-02 11:11:05 +02:00

..

boot

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2012-03-30 18:15:43 -07:00

common

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2012-03-29 16:53:48 -07:00

configs

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2012-03-29 16:53:48 -07:00

include/asm

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

kernel

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

lib

…

mach-at91

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-bcmring

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-clps711x

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-cns3xxx

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-davinci

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

mach-dove

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-ebsa110

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-ep93xx

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-exynos

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-footbridge

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-gemini

ARM: remove bunch of now unused mach/io.h files

2012-03-06 21:34:44 -06:00

mach-h720x

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-highbank

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-imx

MX2: Fix mx2_camera clock regression.

2012-04-02 11:11:05 +02:00

mach-integrator

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-iop13xx

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-iop32x

ARM: kill off __mem_pci

2012-03-06 21:34:45 -06:00

mach-iop33x

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-ixp4xx

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-ixp23xx

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-ixp2000

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-kirkwood

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

mach-ks8695

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-l7200/include/mach

…

mach-lpc32xx

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 21:30:28 -07:00

mach-mmp

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-msm

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-mv78xx0

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-mxs

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

2012-03-30 17:31:56 -07:00

mach-netx

ARM: __io abuse cleanup

2012-03-13 21:25:21 -05:00

mach-nomadik

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-omap1

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

2012-03-30 17:31:56 -07:00

mach-omap2

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

mach-orion5x

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-picoxcell

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-pnx4008

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-prima2

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-pxa

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-realview

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-rpc

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-s3c24xx

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

2012-03-30 17:31:56 -07:00

mach-s3c64xx

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-s3c2410

Disintegrate asm/system.h for ARM

2012-03-28 18:30:01 +01:00

mach-s3c2412

Disintegrate asm/system.h for ARM

2012-03-28 18:30:01 +01:00

mach-s3c2440

Disintegrate asm/system.h for ARM

2012-03-28 18:30:01 +01:00

mach-s5p64x0

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-s5pc100

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-s5pv210

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-sa1100

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-shark

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-shmobile

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

2012-03-30 17:31:56 -07:00

mach-spear3xx

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-spear6xx

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-tegra

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 21:30:28 -07:00

mach-u300

Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

2012-03-30 17:31:56 -07:00

mach-ux500

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-versatile

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-vexpress

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

mach-vt8500

ARM: remove bunch of now unused mach/io.h files

2012-03-06 21:34:44 -06:00

mach-w90x900

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-30 17:00:34 -07:00

mach-zynq

ARM: remove bunch of now unused mach/io.h files

2012-03-06 21:34:44 -06:00

mm

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

net

ARM: 7259/3: net: JIT compiler for packet filters

2012-03-24 09:38:56 +00:00

nwfpe

Disintegrate asm/system.h for ARM

2012-03-28 18:30:01 +01:00

oprofile

…

plat-iop

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

plat-mxc

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

plat-nomadik

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2012-03-29 16:53:48 -07:00

plat-omap

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 21:30:28 -07:00

plat-orion

ARM: orion: wdt: use resource vice direct access

2012-03-16 04:28:41 +00:00

plat-pxa

Disintegrate asm/system.h for ARM

2012-03-28 18:30:01 +01:00

plat-s3c24xx

ARM: fix builds due to missing <asm/system_misc.h> includes

2012-03-30 15:44:40 -07:00

plat-s5p

Merge branch 'samsung/cleanup-exynos-clock' into next/soc

2012-03-20 10:07:48 +00:00

plat-samsung

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-03-29 15:34:57 -07:00

plat-spear

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2012-03-29 23:17:44 -07:00

plat-versatile

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2012-03-29 16:53:48 -07:00

tools

…

vfp

Disintegrate asm/system.h for ARM

2012-03-28 18:30:01 +01:00

Kconfig

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-03-29 18:02:10 -07:00

Kconfig-nommu

…

Kconfig.debug

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2012-03-29 16:53:48 -07:00

Makefile

Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

2012-03-29 16:53:48 -07:00