diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-11-09 07:44:03 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-09 07:44:03 -0500 |
| commit | 33f57de72af0d5753c8e5833eba636c16ed2b306 (patch) | |
| tree | 39b0b7d31c56d10e77cda7ae02d72153adad5895 | |
| parent | 27d8a0e9b52f89e4a0033ce8a98aac24e9f1d59b (diff) | |
| download | kernel-33f57de72af0d5753c8e5833eba636c16ed2b306.tar.gz kernel-33f57de72af0d5753c8e5833eba636c16ed2b306.tar.xz kernel-33f57de72af0d5753c8e5833eba636c16ed2b306.zip | |
Linux 3.2-rc1-git1 (upstream 19e0bafc36a)
Enable the brcm80211 modules now that they have left staging
| -rw-r--r-- | config-generic | 5 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/config-generic b/config-generic index a668c7825..dfccf0cbb 100644 --- a/config-generic +++ b/config-generic @@ -1569,6 +1569,9 @@ CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +# CONFIG_BRCMDBG is not set CONFIG_HERMES=m CONFIG_HERMES_CACHE_FW_ON_INIT=y # CONFIG_HERMES_PRISM is not set @@ -4488,8 +4491,6 @@ CONFIG_USB_ATMEL=m CONFIG_ALTERA_STAPL=m # CONFIG_DVB_CXD2099 is not set # CONFIG_USBIP_CORE is not set -# CONFIG_BRCMSMAC is not set -# CONFIG_BRCMFMAC is not set # CONFIG_INTEL_MEI is not set # CONFIG_ZCACHE is not set # CONFIG_RTS5139 is not set diff --git a/kernel.spec b/kernel.spec index 4366722a8..ad7eaaa9f 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 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -87,7 +87,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2046,6 +2046,10 @@ fi # ||----w | # || || %changelog +* Wed Nov 09 2011 Josh Boyer <jwboyer@redhat.com> +- Linux 3.2-rc1-git1 +- Enable the brcm80211 modules now that they have left staging + * Tue Nov 08 2011 Josh Boyer <jwboyer@redhat.com> - Add python-perf-debuginfo package (rhbz 752140) @@ -1,2 +1,3 @@ 8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2 c12c4ef15682ca8caa360d013625ea3f patch-3.2-rc1.bz2 +40372c1a7aa9f98e2ee0df1944e826b1 patch-3.2-rc1-git1.bz2 |