diff options
| author |   Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/arm/plat-samsung/clock.c | |
| parent | kconfig: Use PATH_MAX instead of 128 for path buffer sizes. (diff) | |
| parent | kbuild: fix oldnoconfig to do the right thing (diff) | |
| download | linux-dev-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.xz linux-dev-239060b93bb30a4ad55f1ecaa512464a035cc5ba.zip | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/arm/plat-samsung/clock.c')
| -rw-r--r-- | arch/arm/plat-samsung/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c index 8bf79f3efdfb..90a20512d68d 100644 --- a/arch/arm/plat-samsung/clock.c +++ b/arch/arm/plat-samsung/clock.c @@ -391,7 +391,7 @@ void __init s3c_disable_clocks(struct clk *clkp, int nr_clks) (clkp->enable)(clkp, 0); } -/* initalise all the clocks */ +/* initialise all the clocks */ int __init s3c24xx_register_baseclocks(unsigned long xtal) { |