summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/setup.c
diff options
context:
space:
mode:
authorMatt Fleming <matt@console-pimps.org>2009-10-06 21:22:33 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-10-10 21:52:34 +0900
commit20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd (patch)
tree7b14d3c6f7004ca86e444c7237a022a143405e7f /arch/sh/kernel/setup.c
parentef269b32763b22100eda9c0bf99d462c6cd65377 (diff)
downloadop-kernel-dev-20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd.zip
op-kernel-dev-20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd.tar.gz
sh: Fold fixed-PMB support into dynamic PMB support
The initialisation process differs for CONFIG_PMB and for CONFIG_PMB_FIXED. For CONFIG_PMB_FIXED we need to register the PMB entries that were allocated by the bootloader. Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/setup.c')
-rw-r--r--arch/sh/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 8fdd03a..df65fe2 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -453,7 +453,7 @@ void __init setup_arch(char **cmdline_p)
paging_init();
-#ifdef CONFIG_PMB
+#ifdef CONFIG_PMB_ENABLE
pmb_init();
#endif
OpenPOWER on IntegriCloud