diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/arm/mm/proc-arm920.S | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/arm/mm/proc-arm920.S')
| -rw-r--r-- | arch/arm/mm/proc-arm920.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S index d16513899999..a17f79e0199c 100644 --- a/arch/arm/mm/proc-arm920.S +++ b/arch/arm/mm/proc-arm920.S | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | #include <linux/config.h> | 28 | #include <linux/config.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
| 31 | #include <asm/pgtable-hwdef.h> | ||
| 31 | #include <asm/pgtable.h> | 32 | #include <asm/pgtable.h> |
| 32 | #include <asm/procinfo.h> | 33 | #include <asm/procinfo.h> |
| 33 | #include <asm/hardware.h> | ||
| 34 | #include <asm/page.h> | 34 | #include <asm/page.h> |
| 35 | #include <asm/ptrace.h> | 35 | #include <asm/ptrace.h> |
| 36 | #include "proc-macros.S" | 36 | #include "proc-macros.S" |