diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:51:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:51:46 +0100 |
| commit | 0b271ef4521756010675b1611bef20fd3096790d (patch) | |
| tree | 2c9d22a2c74122a9904e533df27f41d63ffef394 /arch/x86/kernel/pci-calgary_64.c | |
| parent | b19b3c74c7bbec45a848631b8f970ac110665a01 (diff) | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| download | lwn-0b271ef4521756010675b1611bef20fd3096790d.tar.gz lwn-0b271ef4521756010675b1611bef20fd3096790d.zip | |
Merge commit 'v2.6.28' into core/core
Diffstat (limited to 'arch/x86/kernel/pci-calgary_64.c')
| -rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index e1e731d78f38..d28bbdc35e4e 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -1567,7 +1567,7 @@ static int __init calgary_parse_options(char *p) ++p; if (*p == '\0') break; - bridge = simple_strtol(p, &endp, 0); + bridge = simple_strtoul(p, &endp, 0); if (p == endp) break; |