diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 00:45:28 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 00:45:28 -0400 |
| commit | 77c7ee51a062bb595c501ec098125a68999c20c3 (patch) | |
| tree | c5060ca5786ef353e005dae04b61d2c49967284d /arch/tile/mm/init.c | |
| parent | 1ba762209491e2496e58baffa3fd65d661f54404 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
drivers/tty/serial/sh-sci.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/tile/mm/init.c')
| -rw-r--r-- | arch/tile/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c index 4e10c4023028..7309988c9794 100644 --- a/arch/tile/mm/init.c +++ b/arch/tile/mm/init.c | |||
| @@ -836,8 +836,7 @@ void __init mem_init(void) | |||
| 836 | #endif | 836 | #endif |
| 837 | 837 | ||
| 838 | #ifdef CONFIG_FLATMEM | 838 | #ifdef CONFIG_FLATMEM |
| 839 | if (!mem_map) | 839 | BUG_ON(!mem_map); |
| 840 | BUG(); | ||
| 841 | #endif | 840 | #endif |
| 842 | 841 | ||
| 843 | #ifdef CONFIG_HIGHMEM | 842 | #ifdef CONFIG_HIGHMEM |