[kernel/f17] Enable DRM_VIA again per Adam Jackson

[Josh Boyer]

commit 8511ce03138134fdb931f679188c40e7bd013809
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Mon May 14 11:51:07 2012 -0400

    Enable DRM_VIA again per Adam Jackson

 config-generic |    2 +-
 kernel.spec    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/config-generic b/config-generic
index 6c775dc..8285500 100644
--- a/config-generic
+++ b/config-generic
@@ -2410,7 +2410,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 f7153c8..cdf8d85 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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
@@ -2421,6 +2421,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon May 14 2012 Josh Boyer <jwboyer at redhat.com>
+- Enable DRM_VIA again per Adam Jackson
+
 * Mon May 07 2012 Mauro Carvalho Chehab <mchehab at redhat.com> 3.3.5-2
 - Add patch to fix DVB-S zigzag (rhbz 814404)