diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-05 14:15:30 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-05 14:15:30 -0500 |
| commit | c89a86bb96307019867d11874ef0b86adaa0598e (patch) | |
| tree | c44c1a825e8a143a4c52bcb8692292aeb77fa64e /arch/mips/jmr3927/rbhma3100/setup.c | |
| parent | 07475ffba5800c53573180dd521273642adcd0e9 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/mips/jmr3927/rbhma3100/setup.c')
| -rw-r--r-- | arch/mips/jmr3927/rbhma3100/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 55ad0a578794..4763957df8fc 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c | |||
| @@ -60,6 +60,8 @@ | |||
| 60 | #include <asm/mipsregs.h> | 60 | #include <asm/mipsregs.h> |
| 61 | #include <asm/traps.h> | 61 | #include <asm/traps.h> |
| 62 | 62 | ||
| 63 | extern void puts(unsigned char *cp); | ||
| 64 | |||
| 63 | /* Tick Timer divider */ | 65 | /* Tick Timer divider */ |
| 64 | #define JMR3927_TIMER_CCD 0 /* 1/2 */ | 66 | #define JMR3927_TIMER_CCD 0 /* 1/2 */ |
| 65 | #define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) | 67 | #define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) |