diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-30 01:15:32 +0400 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-10-30 01:15:32 +0400 |
| commit | 19bf7f8ac3f8131100027281c495dbbe00cd5ae0 (patch) | |
| tree | 270b97e3ca47c0f62a1babca2ae37f79a76a309c /arch/um/include/asm/page.h | |
| parent | 787c57c0fb393fe8a3974d300ddcfe30373386fe (diff) | |
| parent | 35fd3dc58da675d659513384221349ef90749a01 (diff) | |
| download | linux-19bf7f8ac3f8131100027281c495dbbe00cd5ae0.tar.xz | |
Merge remote-tracking branch 'master' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/um/include/asm/page.h')
| -rw-r--r-- | arch/um/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h index 7cfc3cedce84..5ff53d9185f7 100644 --- a/arch/um/include/asm/page.h +++ b/arch/um/include/asm/page.h @@ -99,7 +99,7 @@ extern unsigned long uml_physmem; #define __va_space (8*1024*1024) -#include "mem.h" +#include <mem.h> /* Cast to unsigned long before casting to void * to avoid a warning from * mmap_kmem about cutting a long long down to a void *. Not sure that |