diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 22:05:52 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 22:05:52 +0100 |
| commit | 38abdcd0d0689aaca94e740ac67a952c7918caef (patch) | |
| tree | 83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/mach-exynos/common.c | |
| parent | Merge tag 'tegra-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/... (diff) | |
| parent | Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux ... (diff) | |
| download | linux-38abdcd0d0689aaca94e740ac67a952c7918caef.tar.xz linux-38abdcd0d0689aaca94e740ac67a952c7918caef.zip | |
Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2
Conflicts:
arch/arm/mach-tegra/common.c
arch/arm/mach-ux500/devices-common.c
This resolves two conflicts and lets us merge the exynos5 branch
cleanly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/common.c')
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index c59e18871006..031c1e5b3dfe 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -201,14 +201,6 @@ static struct map_desc exynos4_iodesc1[] __initdata = { }, }; -static void exynos_idle(void) -{ - if (!need_resched()) - cpu_do_idle(); - - local_irq_enable(); -} - void exynos4_restart(char mode, const char *cmd) { __raw_writel(0x1, S5P_SWRESET); @@ -467,10 +459,6 @@ early_initcall(exynos4_l2x0_cache_init); int __init exynos_init(void) { printk(KERN_INFO "EXYNOS: Initializing architecture\n"); - - /* set idle function */ - pm_idle = exynos_idle; - return device_register(&exynos4_dev); } |