kernel: take bcm47xx_nvram.h from kernel and not backports
authorJohn Crispin <john@openwrt.org>
Tue, 1 Mar 2016 08:14:34 +0000 (08:14 +0000)
committerJohn Crispin <john@openwrt.org>
Tue, 1 Mar 2016 08:14:34 +0000 (08:14 +0000)
commit70dcf686f98463ffe840469937e3800549cf2025
tree4e077e9c91b9f0d69869c0b91e1aa1393a5d0c3c
parent897aa679c1dd56bdfea161db6894018377b98f8c
kernel: take bcm47xx_nvram.h from kernel and not backports

compat-wireless/backports now contains a bcm47xx_nvram.h file to
backport some of the functions in it which are used by the bcmfmac
driver. This file just checks for the kernel versions and provide an
empty implementations on older kernel versions. This is OK on most
systems, but on bcm47xx / bcm53xx systems we want to call the real
functions here. This commit removes the file from backports in our
build process like we do it with the bcma and ssb header files. Instead
we add a recent version into our kernel so all code uses only one
header file. On bcm47xx / bcm53xx the real implementations of this code
will be used.

Reported-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
[Backport of r47467. The recent mac80211 backport was missing this patch,
breaking the build of the brcmfmac module]
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 48831
target/linux/bcm53xx/files/include/linux/bcm47xx_nvram.h [deleted file]
target/linux/brcm47xx/patches-3.18/031-05-MIPS-BCM47xx-Move-NVRAM-header-to-the-include-linux.patch
target/linux/brcm47xx/patches-3.18/032-08-mips-bcm47xx-allow-retrieval-of-complete-nvram-conte.patch
target/linux/generic/patches-3.18/030-backport_bcm47xx_nvram.patch [new file with mode: 0644]