diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 21:03:43 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 21:03:43 +0200 |
| commit | 949abd84cd54ff864efca9df822d1e02a56694ec (patch) | |
| tree | 0c0e7696a51e2989f11a37478ff26368cab0e227 /arch/arm/mach-omap1/clock.c | |
| parent | [ARM] 5529/1: davinci: MMC platform support: DMA_32BIT_MASK --> DMA_BIT_MASK(32) (diff) | |
| parent | Merge branch 'omap4' into for-next (diff) | |
| download | linux-949abd84cd54ff864efca9df822d1e02a56694ec.tar.xz linux-949abd84cd54ff864efca9df822d1e02a56694ec.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 336e51dc6127..436eed22801b 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -776,7 +776,7 @@ int __init omap1_clk_init(void) arm_idlect1_mask = ~0; for (c = omap_clks; c < omap_clks + ARRAY_SIZE(omap_clks); c++) - clk_init_one(c->lk.clk); + clk_preinit(c->lk.clk); cpu_mask = 0; if (cpu_is_omap16xx()) |