diff --git a/debian/changelog b/debian/changelog index 6cf278b87..4509edbd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low * Disable smbfs in topconfig, not supported upstream, use cifs. * Disable bcm43xx, deprecated by upstream. Enable B43 (needs v4 firmware) and B43LEGACY (needs v3 firmware). - * [i386] Set SND_SC6000. + * [i386] Set SND_SC6000, EDAC_I3000, EDAC_I5000. [ Bastian Blank ] * [amd64, i386]: Set kernel architecture to x86. @@ -23,7 +23,7 @@ linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low [ Martin Michlmayr ] * [mipsel/r5k-cobalt] Enable the new LEDs driver for Cobalt RaQ. - -- maximilian attems Sun, 2 Dec 2007 13:06:40 +0100 + -- maximilian attems Sun, 2 Dec 2007 13:27:46 +0100 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low diff --git a/debian/config/i386/config b/debian/config/i386/config index 2bbf6d75e..64f4573a0 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -1471,12 +1471,14 @@ CONFIG_CS5535_GPIO=m CONFIG_SND_CS5535AUDIO=m CONFIG_VM86=y CONFIG_SPARSEMEM_STATIC=y +CONFIG_EDAC=y # CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I5000=m CONFIG_EDAC_AMD76X=m CONFIG_EDAC_E7XXX=m -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=m # CONFIG_VMSPLIT_3G is not set CONFIG_VMSPLIT_3G_OPT=y CONFIG_EDAC_I82860=m