* 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
This commit is contained in:
Bastian Blank 2009-12-04 17:35:58 +00:00
parent 5d70571c39
commit be38547902
4 changed files with 3 additions and 8 deletions

1
debian/changelog vendored
View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
##