From 53d491d04770dac7e402b20340561ccb399981c9 Mon Sep 17 00:00:00 2001 From: Oliver Schinagl Date: Tue, 12 Apr 2011 14:37:13 +0000 Subject: uptream changes taht won't work \(yet\) --- uClinux-2.4.20-uc1/include/asm-armnommu/memory.h | 2 -- uClinux-2.4.20-uc1/include/asm-armnommu/page.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/uClinux-2.4.20-uc1/include/asm-armnommu/memory.h b/uClinux-2.4.20-uc1/include/asm-armnommu/memory.h index 91195f3..a3b919e 100644 --- a/uClinux-2.4.20-uc1/include/asm-armnommu/memory.h +++ b/uClinux-2.4.20-uc1/include/asm-armnommu/memory.h @@ -28,7 +28,6 @@ #define phys_to_virt(x) ((void *) (x)) -#if 0 /* * For some reason other asm/.h files refer to these instead of the more * public macros above. @@ -38,7 +37,6 @@ #define __bus_to_virt(x) ((void *) (x)) #define __virt_to_phys(x) ((unsigned long) (x)) #define __phys_to_virt(x) ((void *) (x)) -#endif /* * arch/armnommu/kernel/armksyms.c needs these. diff --git a/uClinux-2.4.20-uc1/include/asm-armnommu/page.h b/uClinux-2.4.20-uc1/include/asm-armnommu/page.h index 989ec74..16d7ec4 100644 --- a/uClinux-2.4.20-uc1/include/asm-armnommu/page.h +++ b/uClinux-2.4.20-uc1/include/asm-armnommu/page.h @@ -1,6 +1,7 @@ #ifndef _ASMARM_PAGE_H #define _ASMARM_PAGE_H +#include #include #define PAGE_SIZE (1UL << PAGE_SHIFT) -- cgit v0.12