diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-11 10:03:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-11 10:03:43 -0500 |
| commit | 2be549056941a6d25e0a78978210b8314df69fa5 (patch) | |
| tree | dc2a7580d41ffa8be314b2fb3171cc8b537feedc /kernel.spec | |
| parent | 9b8fcc47a0f9c8efbeaf23915d976dd26169de03 (diff) | |
| download | kernel-2be549056941a6d25e0a78978210b8314df69fa5.tar.gz kernel-2be549056941a6d25e0a78978210b8314df69fa5.tar.xz kernel-2be549056941a6d25e0a78978210b8314df69fa5.zip | |
Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 205efc448..baceb5d66 100644 --- a/kernel.spec +++ b/kernel.spec @@ -704,6 +704,8 @@ Patch21070: oom-fix-integer-overflow-of-points.patch Patch21080: sysfs-msi-irq-per-device.patch +Patch21090: bcma-brcmsmac-compat.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1340,6 +1342,9 @@ ApplyPatch oom-fix-integer-overflow-of-points.patch # Add msi irq ennumeration in sysfs for devices ApplyPatch sysfs-msi-irq-per-device.patch +# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331 +ApplyPatch bcma-brcmsmac-compat.patch + # END OF PATCH APPLICATIONS %endif @@ -2046,6 +2051,9 @@ fi # ||----w | # || || %changelog +* Fri Nov 11 2011 John W. Linville <linville@redhat.com> +- Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331 + * Thu Nov 10 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.2-rc1-git2 |