From be38547902856f89d3dab312abc10382d52c0638 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 4 Dec 2009 17:35:58 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config/kernelarch-x86/config: Set AGP and AGP_AMD64 to module. * debian/config/kernelarch-x86/config-arch-32, debian/config/kernelarch-x86/config-arch-64: Remove duplicated options. svn path=/dists/trunk/linux-2.6/; revision=14733 --- debian/changelog | 1 + debian/config/kernelarch-x86/config | 2 ++ debian/config/kernelarch-x86/config-arch-32 | 2 -- debian/config/kernelarch-x86/config-arch-64 | 6 ------ 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f0f742bb..6cea7db67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low * Always enable software watchdog support. * Always enable complete USB mass storage support. * [amd64, powerpc, sparc] Build USB support as module. + * [amd64] Build AGP support as module. [ Ben Hutchings ] * Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 7bfcd7d68..8917622cf 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -263,6 +263,8 @@ CONFIG_HANGCHECK_TIMER=m ## ## file: drivers/char/agp/Kconfig ## +CONFIG_AGP=m +CONFIG_AGP_AMD64=m CONFIG_AGP_INTEL=m CONFIG_AGP_SIS=m CONFIG_AGP_VIA=m diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 54dcb1fd6..ee9bfaf63 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -125,11 +125,9 @@ CONFIG_CS5535_GPIO=m ## ## file: drivers/char/agp/Kconfig ## -CONFIG_AGP=m CONFIG_AGP_ALI=m CONFIG_AGP_ATI=m CONFIG_AGP_AMD=m -CONFIG_AGP_AMD64=m CONFIG_AGP_NVIDIA=m CONFIG_AGP_SWORKS=m CONFIG_AGP_EFFICEON=m diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index e744bf53b..ab4f4d1a1 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -56,12 +56,6 @@ CONFIG_SPECIALIX=m CONFIG_RIO=m CONFIG_RIO_OLDPCI=y -## -## file: drivers/char/agp/Kconfig -## -CONFIG_AGP=y -CONFIG_AGP_AMD64=y - ## ## file: drivers/i2c/busses/Kconfig ##