diff options
| -rw-r--r-- | config-generic | 7 | ||||
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | mod-extra.list | 1 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/config-generic b/config-generic index e103426ff..f7ec7374d 100644 --- a/config-generic +++ b/config-generic @@ -1542,12 +1542,7 @@ CONFIG_MAC80211_LEDS=y CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_SDIO=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 -# CONFIG_WIMAX_IWMC3200_SDIO is not set +# CONFIG_WIMAX is not set # CONFIG_ADM8211 is not set CONFIG_ATH_COMMON=m diff --git a/kernel.spec b/kernel.spec index 6c8d7a1fe..64e72a0e2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2245,6 +2245,10 @@ fi # ||----w | # || || %changelog +* Wed Aug 14 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc5.git2.1 +- Linux v3.11-rc5-21-g28fbc8b +- Disable WIMAX. It's fairly broken and abandoned upstream. + * Tue Aug 13 2013 Josh Boyer <jwboyer@gmail.com> - 3.11.0-0.rc5.git1.1 - Linux v3.11-rc5-13-g584d88b - Reenable debugging options. diff --git a/mod-extra.list b/mod-extra.list index 53f8c36b9..2803a4325 100644 --- a/mod-extra.list +++ b/mod-extra.list @@ -76,7 +76,6 @@ softing_cs.ko softing.ko ems_usb.ko esd_usb2.ko -wimax.ko nfc.ko nci.ko mptbase.ko @@ -1,3 +1,3 @@ 4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz fecb4054f3798d72f91b5df586a38d83 patch-3.11-rc5.xz -2ad8d0db8a3752eae1b3386be4b7e01e patch-3.11-rc5-git1.xz +fcb4c05aed8be361ab4153264e3560fe patch-3.11-rc5-git2.xz |