diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2011-04-12 14:37:13 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2011-04-12 14:37:13 (GMT) |
| commit | 53d491d04770dac7e402b20340561ccb399981c9 (patch) | |
| tree | 981522179b10df7b8bd9e06ee3cf8b0592cc8cfe | |
| parent | 936b58fc261c4f4e19046b34cac0da7e64591b54 (diff) | |
| download | openipcam-53d491d04770dac7e402b20340561ccb399981c9.zip openipcam-53d491d04770dac7e402b20340561ccb399981c9.tar.gz openipcam-53d491d04770dac7e402b20340561ccb399981c9.tar.bz2 | |
uptream changes taht won't work \(yet\)
| -rw-r--r-- | uClinux-2.4.20-uc1/include/asm-armnommu/memory.h | 2 | ||||
| -rw-r--r-- | uClinux-2.4.20-uc1/include/asm-armnommu/page.h | 1 |
2 files changed, 1 insertions, 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 <asm/memory.h> #include <asm/proc/page.h> #define PAGE_SIZE (1UL << PAGE_SHIFT) |