diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 20:07:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 20:07:25 -0800 |
| commit | dd7c7c3f69291baa488b8a50db683d5fbf44166a (patch) | |
| tree | 925bf294f30dffaa67a983c3859926ff53937e14 /arch/x86/include/asm/mrst.h | |
| parent | UART: add CSR SiRFprimaII SoC on-chip uart drivers (diff) | |
| parent | Linux 3.2-rc3 (diff) | |
| download | linux-dev-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.xz linux-dev-dd7c7c3f69291baa488b8a50db683d5fbf44166a.zip | |
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/include/asm/mrst.h')
| -rw-r--r-- | arch/x86/include/asm/mrst.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h index 470776039af9..7216907eb767 100644 --- a/arch/x86/include/asm/mrst.h +++ b/arch/x86/include/asm/mrst.h @@ -44,6 +44,13 @@ enum mrst_timer_options { extern enum mrst_timer_options mrst_timer_options; +/* + * Penwell uses spread spectrum clock, so the freq number is not exactly + * the same as reported by MSR based on SDM. + */ +#define PENWELL_FSB_FREQ_83SKU 83200 +#define PENWELL_FSB_FREQ_100SKU 99840 + #define SFI_MTMR_MAX_NUM 8 #define SFI_MRTC_MAX 8 |