diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 16:58:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 16:58:49 -0700 |
| commit | d0312d7edc84a5b3b2e2106fde644b61dd10fbf9 (patch) | |
| tree | b6d334f6bb6f91b4493bfb36d033411b206fce25 /arch/arm/mach-imx/clk.h | |
| parent | 025c95a6826ad8acfe871f33c2fa9208beeb38df (diff) | |
| parent | 51f66191cf54ba3d62dd7e4a77dd376cc97de27f (diff) | |
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
ARM i.MX cleanup patches
* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX53 clk: Fix ldb parent clocks
serial/imx: fix IMX UART macro usage to reflect correct processor
ARM: i.MX remove last leftovers from legacy clock support
ARM: i.MX clk pllv1: move mxc_decode_pll code to its user
ARM: imx27-phytec-phycore: Fix I2C EEPROM address
ARM i.MX mx2_camera: Remove MX2_CAMERA_SWAP16 and MX2_CAMERA_PACK_DIR_MSB flags.
ARM i.MX: remove duplicated include from clk-imx21.c
ARM: plat-mxc: Remove unused imx_ioremap
Diffstat (limited to 'arch/arm/mach-imx/clk.h')
| -rw-r--r-- | arch/arm/mach-imx/clk.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h index 1bf64fe2523..5f2d8acca25 100644 --- a/arch/arm/mach-imx/clk.h +++ b/arch/arm/mach-imx/clk.h @@ -3,7 +3,8 @@ #include <linux/spinlock.h> #include <linux/clk-provider.h> -#include <mach/clock.h> + +extern spinlock_t imx_ccm_lock; struct clk *imx_clk_pllv1(const char *name, const char *parent, void __iomem *base); |