diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/arm/mach-omap1/clock.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
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) | |||
| 776 | arm_idlect1_mask = ~0; | 776 | arm_idlect1_mask = ~0; |
| 777 | 777 | ||
| 778 | for (c = omap_clks; c < omap_clks + ARRAY_SIZE(omap_clks); c++) | 778 | for (c = omap_clks; c < omap_clks + ARRAY_SIZE(omap_clks); c++) |
| 779 | clk_init_one(c->lk.clk); | 779 | clk_preinit(c->lk.clk); |
| 780 | 780 | ||
| 781 | cpu_mask = 0; | 781 | cpu_mask = 0; |
| 782 | if (cpu_is_omap16xx()) | 782 | if (cpu_is_omap16xx()) |