diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:34:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:34:17 -0800 |
| commit | b391738bd1c708fe85592410c6a7c9752689481d (patch) | |
| tree | e4a27d1b98725dcc42eae65f72a9ac4375420faa /arch/x86/Kconfig | |
| parent | e33c01972239fee4696679ae5f7d1f340f424999 (diff) | |
| parent | 2fb8f4e6a83dcaec15c1dd0ee8a6f618e7ece7f0 (diff) | |
| download | blackbird-obmc-linux-b391738bd1c708fe85592410c6a7c9752689481d.tar.gz blackbird-obmc-linux-b391738bd1c708fe85592410c6a7c9752689481d.zip | |
Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: pat: Remove ioremap_default()
x86: pat: Clean up req_type special case for reserve_memtype()
x86: Relegate CONFIG_PAT and CONFIG_MTRR configurability to EMBEDDED
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1b2182b4d5c8..a6cb3c32a1d3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1332,7 +1332,9 @@ config MATH_EMULATION kernel, it won't hurt. config MTRR - bool "MTRR (Memory Type Range Register) support" + bool + default y + prompt "MTRR (Memory Type Range Register) support" if EMBEDDED ---help--- On Intel P6 family processors (Pentium Pro, Pentium II and later) the Memory Type Range Registers (MTRRs) may be used to control @@ -1398,7 +1400,8 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT config X86_PAT bool - prompt "x86 PAT support" + default y + prompt "x86 PAT support" if EMBEDDED depends on MTRR ---help--- Use PAT attributes to setup page level cache control. |
