diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 12:55:53 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 12:55:53 -0400 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /include/asm-sh/cpu-sh3/freq.h | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-sh/cpu-sh3/freq.h')
| -rw-r--r-- | include/asm-sh/cpu-sh3/freq.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-sh/cpu-sh3/freq.h b/include/asm-sh/cpu-sh3/freq.h index b61b6e331df0..273f3229785c 100644 --- a/include/asm-sh/cpu-sh3/freq.h +++ b/include/asm-sh/cpu-sh3/freq.h | |||
| @@ -18,5 +18,9 @@ | |||
| 18 | #define MIN_DIVISOR_NR 0 | 18 | #define MIN_DIVISOR_NR 0 |
| 19 | #define MAX_DIVISOR_NR 4 | 19 | #define MAX_DIVISOR_NR 4 |
| 20 | 20 | ||
| 21 | #define FRQCR_CKOEN 0x0100 | ||
| 22 | #define FRQCR_PLLEN 0x0080 | ||
| 23 | #define FRQCR_PSTBY 0x0040 | ||
| 24 | |||
| 21 | #endif /* __ASM_CPU_SH3_FREQ_H */ | 25 | #endif /* __ASM_CPU_SH3_FREQ_H */ |
| 22 | 26 | ||