summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-02-21 11:34:59 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-02-21 11:35:35 -0500
commit73a9923d68b217d78c29a5e8f21fa1786401510d (patch)
tree421cc5f93c1e3b348cd9c2aa74b3deb03ad7c1fb
parent12b12c6ad67192aa4d9b64d7a4e7d147287fadaa (diff)
downloadkernel-73a9923d68b217d78c29a5e8f21fa1786401510d.tar.gz
kernel-73a9923d68b217d78c29a5e8f21fa1786401510d.tar.xz
kernel-73a9923d68b217d78c29a5e8f21fa1786401510d.zip
Enable rtl8712 driver (rhbz 699618)
-rw-r--r--config-generic3
-rw-r--r--kernel.spec5
2 files changed, 5 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index 7d8a05869..ee3e39bf3 100644
--- a/config-generic
+++ b/config-generic
@@ -4273,7 +4273,8 @@ CONFIG_USB_ATMEL=m
# CONFIG_EASYCAP is not set
# CONFIG_SOLO6X10 is not set
# CONFIG_ACPI_QUICKSTART is not set
-# CONFIG_R8712U is not set
+CONFIG_R8712U=m # Larry Finger maintains this (rhbz 699618)
+# CONFIG_R8712_AP is not set
# CONFIG_ATH6K_LEGACY is not set
# CONFIG_USB_ENESTORAGE is not set
# CONFIG_BCM_WIMAX is not set
diff --git a/kernel.spec b/kernel.spec
index 8b4560a82..47f21ecdb 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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2365,7 +2365,8 @@ fi
# ||----w |
# || ||
%changelog
-* Tue Feb 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc4.git1.1
+* Tue Feb 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc4.git1.2
+- Enable rtl8712 driver (rhbz 699618)
- Linux 3.3-rc4-git1 (upstream 27e74da9800289e69ba907777df1e2085231eff7)
* Mon Feb 20 2012 Dave Jones <davej@redhat.com>