diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:09:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:09:44 -0800 |
| commit | a67f1b5da2cf8b14395596048c876247b894aa5c (patch) | |
| tree | 0f125e709fddc4d32579fb267ede0f9c8079ff11 /include/asm-arm/memory.h | |
| parent | e9e7d7fa16122d7bfa6f87188828baf6080cb02e (diff) | |
v2.4.8 -> v2.4.8.1
- Rui Sousa: emu10k1 module fixes, remove joystick part.
- Alan Cox: driver merges
- Andrea Arkangeli: alpha updates
- David Woodhouse: up_and_exit -> complete_and_exit
- David Miller: sparc and network update
- Andrew Morton: update 3c59x driver
- Neil Brown: NFS export VFAT, knfsd cleanups, raid fixes
- Ben Collins: ieee1394 updates
- Paul Mackerras: PPC update
- me: make sure we don't lose position bits in "filldir()"
Diffstat (limited to 'include/asm-arm/memory.h')
| -rw-r--r-- | include/asm-arm/memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index f2e0d2be90a5..c9f63415e223 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h @@ -16,12 +16,12 @@ #include <asm/arch/memory.h> -extern __inline__ unsigned long virt_to_phys(volatile void *x) +static inline unsigned long virt_to_phys(volatile void *x) { return __virt_to_phys((unsigned long)(x)); } -extern __inline__ void *phys_to_virt(unsigned long x) +static inline void *phys_to_virt(unsigned long x) { return (void *)(__phys_to_virt((unsigned long)(x))); } |