diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2003-09-03 20:19:25 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2003-09-03 20:19:25 +0100 |
| commit | ac7ebfb23521ef77b3af31d57faffabb2b6f98ca (patch) | |
| tree | f5c7e3fd4839c307b59fc1774a386befde9f9491 /include/asm-arm/memory.h | |
| parent | de950cef51ac8d7bd67d305857c0bee7bb8a97e5 (diff) | |
[ARM] Remove more reminants of 26-bit ARM support.
This removes include/asm-arm/proc-armv entirely, merging the
contents into the relevant include files in include/asm-arm.
We also update various files in arch/arm which reference
definitions in the now non-existent directory.
Diffstat (limited to 'include/asm-arm/memory.h')
| -rw-r--r-- | include/asm-arm/memory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index 1b61a0e02c20..588c47d26338 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h @@ -15,6 +15,8 @@ #include <linux/config.h> #include <asm/arch/memory.h> +#ifndef __ASSEMBLY__ + /* * PFNs are used to describe any physical page; this means * PFN 0 == physical address 0. @@ -120,3 +122,5 @@ static inline void *phys_to_virt(unsigned long x) #define page_to_bus(page) (virt_to_bus(page_address(page))) #endif + +#endif |