diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 08:18:01 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 08:18:01 +0100 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /include/asm-arm/system.h | |
| parent | drm: major update from CVS for radeon and core (diff) | |
| parent | Linux v2.6.15 (diff) | |
| download | linux-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.xz linux-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.zip | |
drm: merge in Linus mainline
Diffstat (limited to 'include/asm-arm/system.h')
| -rw-r--r-- | include/asm-arm/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index 8efa4ebdcacb..5621d61ebc07 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h @@ -93,8 +93,6 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *), int sig, const char *name); -#include <asm/proc-fns.h> - #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) @@ -102,6 +100,8 @@ void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int, extern asmlinkage void __backtrace(void); extern asmlinkage void c_backtrace(unsigned long fp, int pmode); + +struct mm_struct; extern void show_pte(struct mm_struct *mm, unsigned long addr); extern void __show_regs(struct pt_regs *); |