diff options
author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2006-12-06 23:33:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:26 -0500 |
commit | 3869aa292fbd24103b8338937cb351459efe3f82 (patch) | |
tree | c6b9c2135fea91c5cb5bd18f98a8686fc3add5f2 /arch | |
parent | 4d3eeeac97a6e4fc1ff3ad184f1c3bf328de7cb6 (diff) |
[PATCH] h8300 stray bracket fix
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-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 |