diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /arch/h8300/kernel/setup.c | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'arch/h8300/kernel/setup.c')
| -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 |