diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-29 13:08:11 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-29 13:08:11 -0500 |
| commit | 47992cbdaef2f18a47871b2ed01ad27f568c8b73 (patch) | |
| tree | bfed4f8c7ea3164afc75a85ab3624586c37c37f4 /arch/arm/mach-sa1100 | |
| parent | 4655a0de36e8e903e99a8d152818e3aae86dae1a (diff) | |
| parent | 198fc108ee4c2cd3f08954eae6a819c81c03214b (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/hardware.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/hardware.h b/arch/arm/mach-sa1100/include/mach/hardware.h index b70846c096aa..60711822b125 100644 --- a/arch/arm/mach-sa1100/include/mach/hardware.h +++ b/arch/arm/mach-sa1100/include/mach/hardware.h | |||
| @@ -59,6 +59,10 @@ | |||
| 59 | # define __REG(x) (*((volatile unsigned long *)io_p2v(x))) | 59 | # define __REG(x) (*((volatile unsigned long *)io_p2v(x))) |
| 60 | # define __PREG(x) (io_v2p((unsigned long)&(x))) | 60 | # define __PREG(x) (io_v2p((unsigned long)&(x))) |
| 61 | 61 | ||
| 62 | static inline unsigned long get_clock_tick_rate(void) | ||
| 63 | { | ||
| 64 | return 3686400; | ||
| 65 | } | ||
| 62 | #else | 66 | #else |
| 63 | 67 | ||
| 64 | # define __REG(x) io_p2v(x) | 68 | # define __REG(x) io_p2v(x) |