diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:48:13 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:49:06 -0500 |
commit | 85910c202bb869edd2bb9a6c217a658c83f06f1e (patch) | |
tree | fcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217e /arch/arm/mach-kirkwood/board-dt.c | |
parent | f7200d4c504a385b1b70f3bab379f99745f7ef6a (diff) | |
parent | 517ffce4e1a03aea979fe3a18a3dd1761a24fafb (diff) | |
download | linux-85910c202bb869edd2bb9a6c217a658c83f06f1e.tar.bz2 |
Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc
Backmerge from the point in mainline where a trivial conflict had been
introduced (arch/sparc/kernel/sys_sparc_64.c had grown sys_kern_features()
right after where kernel_execve() used to be)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-dt.c')
-rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 70c5a2882409..d94872fed8c0 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -51,9 +51,7 @@ static void __init kirkwood_dt_init(void) kirkwood_setup_cpu_mbus(); -#ifdef CONFIG_CACHE_FEROCEON_L2 kirkwood_l2_init(); -#endif /* Setup root of clk tree */ kirkwood_clk_init(); |