diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-07-10 09:43:44 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-07-10 11:49:54 -0400 |
| commit | e04b212cc5b43cda75aee2b6efa65c9234138713 (patch) | |
| tree | 5de85a3f57663c3396d6a17e3119b780d74184b7 /config-x86_64-generic | |
| parent | 75d6a46098fa643e6cceddd2763f840c258b1055 (diff) | |
| download | kernel-e04b212cc5b43cda75aee2b6efa65c9234138713.tar.gz kernel-e04b212cc5b43cda75aee2b6efa65c9234138713.tar.xz kernel-e04b212cc5b43cda75aee2b6efa65c9234138713.zip | |
update to snapshot 3.0-rc6-git6
revert CONFIG_X86_RESERVE_LOW=640, it breaks boot.
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 7700e4e9d..f4c3c30cf 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -366,7 +366,7 @@ CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set -CONFIG_X86_RESERVE_LOW=640 +CONFIG_X86_RESERVE_LOW_64K=y # CONFIG_CMDLINE_BOOL is not set @@ -444,6 +444,7 @@ CONFIG_IDEAPAD_LAPTOP=m CONFIG_EDAC_MCE_INJ=m CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_X86_RESERVE_LOW=64 CONFIG_PCH_GBE=m CONFIG_PCH_PHUB=m |