git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
/home/lenb/src/to-akpm branch 'acpi-2.6.12'
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
mm
/
ioremap.c
diff --git
a/arch/x86_64/mm/ioremap.c
b/arch/x86_64/mm/ioremap.c
index 58aac23760efeb3e37aa76ab888e3e900b7ac667..6972df480d2b16f485c8dd5e40c96031e74d27fe 100644
(file)
--- a/
arch/x86_64/mm/ioremap.c
+++ b/
arch/x86_64/mm/ioremap.c
@@
-178,7
+178,7
@@
void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
return (__force void __iomem *)phys_to_virt(phys_addr);
-#if
ndef CONFIG_DISCONTIG
MEM
+#if
def CONFIG_FLAT
MEM
/*
* Don't allow anybody to remap normal RAM that we're using..
*/