diff options
Diffstat (limited to 'arch/h8300')
-rw-r--r-- | arch/h8300/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index 1077b71d5226..6adf8f41d2a1 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c | |||
@@ -116,7 +116,7 @@ void __init setup_arch(char **cmdline_p) | |||
116 | #endif | 116 | #endif |
117 | #else | 117 | #else |
118 | if ((memory_end < CONFIG_BLKDEV_RESERVE_ADDRESS) && | 118 | if ((memory_end < CONFIG_BLKDEV_RESERVE_ADDRESS) && |
119 | (memory_end > CONFIG_BLKDEV_RESERVE_ADDRESS) | 119 | (memory_end > CONFIG_BLKDEV_RESERVE_ADDRESS)) |
120 | /* overlap userarea */ | 120 | /* overlap userarea */ |
121 | memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS; | 121 | memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS; |
122 | #endif | 122 | #endif |