diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
| commit | e7e37ee9c547213d726b29c2510cbb6696050405 (patch) | |
| tree | 50c45625de666b23f209d79eb1bfae05c64feee9 /include/asm-arm/arch-l7200/gp_timers.h | |
| parent | c243f1f1f6545985afcc6adf1fc085729029c3ee (diff) | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
Merge ../linus/
Diffstat (limited to 'include/asm-arm/arch-l7200/gp_timers.h')
| -rw-r--r-- | include/asm-arm/arch-l7200/gp_timers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-l7200/gp_timers.h b/include/asm-arm/arch-l7200/gp_timers.h index 6f20962df248..9c4804d13578 100644 --- a/include/asm-arm/arch-l7200/gp_timers.h +++ b/include/asm-arm/arch-l7200/gp_timers.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #ifndef _ASM_ARCH_GPTIMERS_H | 10 | #ifndef _ASM_ARCH_GPTIMERS_H |
| 11 | #define _ASM_ARCH_GPTIMERS_H | 11 | #define _ASM_ARCH_GPTIMERS_H |
| 12 | 12 | ||
| 13 | #include <asm/arch/hardware.h> | 13 | #include <asm/hardware.h> |
| 14 | 14 | ||
| 15 | /* | 15 | /* |
| 16 | * Layout of L7200 general purpose timer registers | 16 | * Layout of L7200 general purpose timer registers |