diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
| commit | cf57a308436653f3094590202c77459aab250ff3 (patch) | |
| tree | 8a9e7096e494141911147a1f24865c3d79d583c1 /arch/arm/mm/proc-arm1026.S | |
| parent | faac9bd0e3ce7cb0572ec66e0a426cacf6afa970 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mm/proc-arm1026.S')
| -rw-r--r-- | arch/arm/mm/proc-arm1026.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S index 6ea76321d0df..d6d84d92c7c7 100644 --- a/arch/arm/mm/proc-arm1026.S +++ b/arch/arm/mm/proc-arm1026.S | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | #include <asm/procinfo.h> | 23 | #include <asm/procinfo.h> |
| 24 | #include <asm/ptrace.h> | 24 | #include <asm/ptrace.h> |
| 25 | 25 | ||
| 26 | #include "proc-macros.S" | ||
| 27 | |||
| 26 | /* | 28 | /* |
| 27 | * This is the maximum size of an area which will be invalidated | 29 | * This is the maximum size of an area which will be invalidated |
| 28 | * using the single invalidate entry instructions. Anything larger | 30 | * using the single invalidate entry instructions. Anything larger |