diff --git a/debian/changelog b/debian/changelog index f50b020ec..97ec74c53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,7 @@ linux-2.6 (2.6.30-1~experimental.1) UNRELEASED; urgency=low * Enable Network console logging support. * [s390/s390x-tape] Add image. * [s390/s390, s390/s390-tape] Remove images. + * [i386/486] Enable High Memory Support. [ dann frazier ] * Enable bnx2x, using firmware-split patches from net-next and mirroring diff --git a/debian/config/i386/none/config.486 b/debian/config/i386/none/config.486 index de80896ee..3001980c1 100644 --- a/debian/config/i386/none/config.486 +++ b/debian/config/i386/none/config.486 @@ -5,10 +5,6 @@ CONFIG_X86_UP_APIC=y CONFIG_X86_UP_IOAPIC=y # CONFIG_X86_MCE is not set -## choice: High Memory Support -CONFIG_NOHIGHMEM=y -# CONFIG_HIGHMEM4G is not set -## end choice CONFIG_MATH_EMULATION=y CONFIG_EISA=y CONFIG_MCA=y