diff options
author | Matt Fleming <matt@console-pimps.org> | 2009-10-06 17:22:33 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-10 08:52:34 -0400 |
commit | 20b5014b3e5fe7b874a3f6a1dc03b0c21cb222cd (patch) | |
tree | 7b14d3c6f7004ca86e444c7237a022a143405e7f /arch/sh/kernel/setup.c | |
parent | ef269b32763b22100eda9c0bf99d462c6cd65377 (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 8fdd03a67680..df65fe2d43b8 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -453,7 +453,7 @@ void __init setup_arch(char **cmdline_p) | |||
453 | 453 | ||
454 | paging_init(); | 454 | paging_init(); |
455 | 455 | ||
456 | #ifdef CONFIG_PMB | 456 | #ifdef CONFIG_PMB_ENABLE |
457 | pmb_init(); | 457 | pmb_init(); |
458 | #endif | 458 | #endif |
459 | 459 | ||