diff --git a/kconfig/2007.1/ChangeLog b/kconfig/2007.1/ChangeLog index 3e87bc11..f44e47ea 100644 --- a/kconfig/2007.1/ChangeLog +++ b/kconfig/2007.1/ChangeLog @@ -1,5 +1,11 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/ChangeLog,v 1.9 2007-11-06 17:27:04 armin76 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/kconfig/2007.1/ChangeLog,v 1.10 2007-11-08 01:30:41 wolf31o2 Exp $ + + 08 Nov 2007; Chris Gianelloni + amd64/installcd-2.6.22.config, amd64/livecd-2.6.22.config, + x86/installcd-2.6.22.config, x86/livecd-2.6.22.config: + Enabled CONFIG_ATM_BR2684 on x86's InstallCD kernel config for bug #191619 + and made sure all amd64/x86 configs are relocatable. 06 Nov 2007; Raúl Porcel +alpha/installcd-2.6.22.config: diff --git a/kconfig/2007.1/amd64/installcd-2.6.22.config b/kconfig/2007.1/amd64/installcd-2.6.22.config index 73de589b..fbb8d0f9 100644 --- a/kconfig/2007.1/amd64/installcd-2.6.22.config +++ b/kconfig/2007.1/amd64/installcd-2.6.22.config @@ -180,7 +180,6 @@ CONFIG_X86_MCE_AMD=y # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_RELOCATABLE=y -CONFIG_PHYSICAL_START=0x200000 CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR_ALL=y diff --git a/kconfig/2007.1/amd64/livecd-2.6.22.config b/kconfig/2007.1/amd64/livecd-2.6.22.config index 41904e07..9a637f75 100644 --- a/kconfig/2007.1/amd64/livecd-2.6.22.config +++ b/kconfig/2007.1/amd64/livecd-2.6.22.config @@ -174,7 +174,6 @@ CONFIG_X86_MCE_AMD=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y CONFIG_RELOCATABLE=y -CONFIG_PHYSICAL_START=0x100000 CONFIG_SECCOMP=y # CONFIG_CC_STACKPROTECTOR is not set CONFIG_HZ_100=y diff --git a/kconfig/2007.1/x86/installcd-2.6.22.config b/kconfig/2007.1/x86/installcd-2.6.22.config index 1a7fe159..3457773e 100644 --- a/kconfig/2007.1/x86/installcd-2.6.22.config +++ b/kconfig/2007.1/x86/installcd-2.6.22.config @@ -232,9 +232,7 @@ CONFIG_HZ_100=y CONFIG_HZ=100 # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x100000 -# CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_RELOCATABLE=y # CONFIG_HOTPLUG_CPU is not set CONFIG_COMPAT_VDSO=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -446,7 +444,7 @@ CONFIG_IPV6_TUNNEL=m CONFIG_ATM=m # CONFIG_ATM_CLIP is not set # CONFIG_ATM_LANE is not set -# CONFIG_ATM_BR2684 is not set +CONFIG_ATM_BR2684=m # CONFIG_BRIDGE is not set CONFIG_VLAN_8021Q=m # CONFIG_DECNET is not set diff --git a/kconfig/2007.1/x86/livecd-2.6.22.config b/kconfig/2007.1/x86/livecd-2.6.22.config index e5d86bb2..16122ae8 100644 --- a/kconfig/2007.1/x86/livecd-2.6.22.config +++ b/kconfig/2007.1/x86/livecd-2.6.22.config @@ -242,9 +242,7 @@ CONFIG_HZ_100=y CONFIG_HZ=100 CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y -CONFIG_PHYSICAL_START=0x100000 -# CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x100000 +CONFIG_RELOCATABLE=y CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y