diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 09:25:16 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 09:27:57 -0800 |
| commit | 823c9faefc5534273aceaca12d845dbc11782a6d (patch) | |
| tree | 5db2ee161f892c5f5523d8a10c596fe4e6b96317 /arch/arm/mach-highbank | |
| parent | 5b7897db00bd66a42c626012f51cd3b1d5e6bee5 (diff) | |
| parent | 7d3b5fac45a5d41cbc6bea9f67bd07a0c50bd118 (diff) | |
| download | linux-stable-823c9faefc5534273aceaca12d845dbc11782a6d.tar.gz linux-stable-823c9faefc5534273aceaca12d845dbc11782a6d.tar.bz2 linux-stable-823c9faefc5534273aceaca12d845dbc11782a6d.zip | |
Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc
From Kukjin Kim:
Just adding camif gpio setup and clkdev.
* 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: Add clkdev entry for camif-upll clock
ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
+ Linux 3.7-rc6
Conflicts due to the 3.7-rc6 sync: arch/arm/mach-highbank/system.c
include/linux/clk-provider.h, resolved as in other branches.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-highbank')
| -rw-r--r-- | arch/arm/mach-highbank/system.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c index 194a5bbb7363..aed96ad9bd4a 100644 --- a/arch/arm/mach-highbank/system.c +++ b/arch/arm/mach-highbank/system.c @@ -26,6 +26,7 @@ void highbank_restart(char mode, const char *cmd) else hignbank_set_pwr_soft_reset(); - cpu_do_idle(); + while (1) + cpu_do_idle(); } |