diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 09:12:56 -0400 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /arch/x86/kernel/e820.c | |
| parent | 93c8b90f01f0dc73891da4e84b26524b61d29d66 (diff) | |
| parent | 0523820482dcb42784572ffd2296c2f08c275a2b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'arch/x86/kernel/e820.c')
| -rw-r--r-- | arch/x86/kernel/e820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 9af89078f7bb..66e48aa2dd1b 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c | |||
| @@ -1203,7 +1203,7 @@ static int __init parse_memmap_opt(char *p) | |||
| 1203 | if (!p) | 1203 | if (!p) |
| 1204 | return -EINVAL; | 1204 | return -EINVAL; |
| 1205 | 1205 | ||
| 1206 | if (!strcmp(p, "exactmap")) { | 1206 | if (!strncmp(p, "exactmap", 8)) { |
| 1207 | #ifdef CONFIG_CRASH_DUMP | 1207 | #ifdef CONFIG_CRASH_DUMP |
| 1208 | /* | 1208 | /* |
| 1209 | * If we are doing a crash dump, we still need to know | 1209 | * If we are doing a crash dump, we still need to know |