git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
i386
/
mm
/
boot_ioremap.c
diff --git
a/arch/i386/mm/boot_ioremap.c
b/arch/i386/mm/boot_ioremap.c
index
4de11f5
..
4de95a1
100644
(file)
--- a/
arch/i386/mm/boot_ioremap.c
+++ b/
arch/i386/mm/boot_ioremap.c
@@
-16,6
+16,7
@@
*/
#undef CONFIG_X86_PAE
+#undef CONFIG_PARAVIRT
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>