diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 11:45:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 11:45:42 -0500 |
| commit | d0fa7e9f8ebeb19db4d2aed33c35f9d16fa7f32d (patch) | |
| tree | 092bf1f6cd50db2272d12ad6991ac3465f2d19ef /include/asm-arm/arch-l7200/aux_reg.h | |
| parent | fbf0e1348ec4023675123d432ce1fdfa1eef8e54 (diff) | |
| parent | 5470dc656820fb67c0a2e352f0aaa48b86c19026 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-l7200/aux_reg.h')
| -rw-r--r-- | include/asm-arm/arch-l7200/aux_reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-l7200/aux_reg.h b/include/asm-arm/arch-l7200/aux_reg.h index 762cbc76c501..5b4396de16a0 100644 --- a/include/asm-arm/arch-l7200/aux_reg.h +++ b/include/asm-arm/arch-l7200/aux_reg.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #ifndef _ASM_ARCH_AUXREG_H | 9 | #ifndef _ASM_ARCH_AUXREG_H |
| 10 | #define _ASM_ARCH_AUXREG_H | 10 | #define _ASM_ARCH_AUXREG_H |
| 11 | 11 | ||
| 12 | #include <asm/arch/hardware.h> | 12 | #include <asm/hardware.h> |
| 13 | 13 | ||
| 14 | #define l7200aux_reg *((volatile unsigned int *) (AUX_BASE)) | 14 | #define l7200aux_reg *((volatile unsigned int *) (AUX_BASE)) |
| 15 | 15 | ||