diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-05-14 11:51:07 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-14 11:52:21 -0400 |
| commit | a426d7787bb50f3b6ca928e07e6f18fbeef3637b (patch) | |
| tree | 3f98cf0da1135a58090f9b5ea5a68c3d1eab0ff2 | |
| parent | d8763818abe0ed7a4a8e3fba351a9efa2ffb6127 (diff) | |
| download | kernel-a426d7787bb50f3b6ca928e07e6f18fbeef3637b.tar.gz kernel-a426d7787bb50f3b6ca928e07e6f18fbeef3637b.tar.xz kernel-a426d7787bb50f3b6ca928e07e6f18fbeef3637b.zip | |
Enable DRM_VIA again per Adam Jackson
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic index 8685d871e..b9978534e 100644 --- a/config-generic +++ b/config-generic @@ -2388,7 +2388,7 @@ CONFIG_DRM_RADEON_KMS=y # CONFIG_DRM_SAVAGE is not set CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y -# CONFIG_DRM_VIA is not set +CONFIG_DRM_VIA=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU_DEBUG=y diff --git a/kernel.spec b/kernel.spec index 256365c28..d448a4ade 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2326,6 +2326,9 @@ fi # ||----w | # || || %changelog +* Mon May 14 2012 Josh Boyer <jwboyer@redhat.com> +- Enable DRM_VIA again per Adam Jackson + * Mon May 14 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc7.git0.2 - Reenable debugging options. |