* debian/changelog: Update.

* debian/config: Make all AGP driver built-in to workaround race-condition
  between DRM and AGP.

svn path=/dists/sid/linux-2.6/; revision=15401
This commit is contained in:
Bastian Blank 2010-03-16 19:14:45 +00:00
parent 41ff40398c
commit fbb493cdc3
6 changed files with 40 additions and 25 deletions

2
debian/changelog vendored
View File

@ -28,6 +28,8 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
#519586, #520702, #522452, #524571, #524596, #526695, #533132, #533432,
#534880, #534978, #541227, #542299, #542614, #543489, #544525, #548345,
#554564, #554621, #559175, #559634)
* [alpha, amd64, i386, amd64, powerpc] Make all AGP driver built-in to
workaround race-condition between DRM and AGP.
[ Ben Hutchings ]
* drm: Apply all changes from 2.6.33 and 2.6.33.1:

View File

@ -167,10 +167,10 @@ CONFIG_MAX_RAW_DEVS=256
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
CONFIG_AGP_ALPHA_CORE=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_ALPHA_CORE=y
##
## file: drivers/char/ipmi/Kconfig

View File

@ -102,12 +102,14 @@ CONFIG_MMTIMER=m
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
CONFIG_AGP_I460=m
CONFIG_AGP_HP_ZX1=m
CONFIG_AGP_SGI_TIOCA=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_I460=y
#. Workaround
CONFIG_AGP_HP_ZX1=y
#. Workaround
CONFIG_AGP_SGI_TIOCA=y
##
## file: drivers/char/ipmi/Kconfig

View File

@ -283,11 +283,16 @@ CONFIG_HPET_MMAP=y
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_AMD64=m
CONFIG_AGP_INTEL=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_AMD64=y
#. Workaround
CONFIG_AGP_INTEL=y
#. Workaround
CONFIG_AGP_SIS=y
#. Workaround
CONFIG_AGP_VIA=y
##
## file: drivers/char/hw_random/Kconfig

View File

@ -125,12 +125,18 @@ CONFIG_CS5535_GPIO=m
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP_ALI=m
CONFIG_AGP_ATI=m
CONFIG_AGP_AMD=m
CONFIG_AGP_NVIDIA=m
CONFIG_AGP_SWORKS=m
CONFIG_AGP_EFFICEON=m
#. Workaround
CONFIG_AGP_ALI=y
#. Workaround
CONFIG_AGP_ATI=y
#. Workaround
CONFIG_AGP_AMD=y
#. Workaround
CONFIG_AGP_NVIDIA=y
#. Workaround
CONFIG_AGP_SWORKS=y
#. Workaround
CONFIG_AGP_EFFICEON=y
##
## file: drivers/crypto/Kconfig

View File

@ -152,10 +152,10 @@ CONFIG_APPLICOM=m
##
## file: drivers/char/agp/Kconfig
##
CONFIG_AGP=m
CONFIG_AGP_SIS=m
CONFIG_AGP_VIA=m
CONFIG_AGP_UNINORTH=m
#. Workaround
CONFIG_AGP=y
#. Workaround
CONFIG_AGP_UNINORTH=y
##
## file: drivers/char/ipmi/Kconfig