diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-13 23:51:31 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-13 23:51:31 +0000 |
| commit | cb0c8da7c26ffbc361f70f4a343e4f82c0429669 (patch) | |
| tree | e2e50203c4a8d33de76f0cb6cc59c7f116a087e4 /target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch | |
| parent | 9d6a9b6f516e650630d94012cb7e898df5301189 (diff) | |
| download | upstream-cb0c8da7c26ffbc361f70f4a343e4f82c0429669.tar.gz upstream-cb0c8da7c26ffbc361f70f4a343e4f82c0429669.tar.bz2 upstream-cb0c8da7c26ffbc361f70f4a343e4f82c0429669.zip | |
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>
SVN-Revision: 47467
Diffstat (limited to 'target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch b/target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch index d8f25ac1fd..ebbe1bbaee 100644 --- a/target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch +++ b/target/linux/generic/patches-4.1/133-MIPS-UAPI-Ignore-__arch_swab-16-32-64-when-using-MIP.patch @@ -30,8 +30,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> arch/mips/include/uapi/asm/swab.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/arch/mips/include/uapi/asm/swab.h b/arch/mips/include/uapi/asm/swab.h -index 8f2d184..23cd9b1 100644 --- a/arch/mips/include/uapi/asm/swab.h +++ b/arch/mips/include/uapi/asm/swab.h @@ -13,8 +13,9 @@ @@ -46,13 +44,10 @@ index 8f2d184..23cd9b1 100644 static inline __attribute_const__ __u16 __arch_swab16(__u16 x) { -@@ -65,5 +66,5 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x) +@@ -65,5 +66,5 @@ static inline __attribute_const__ __u64 } #define __arch_swab64 __arch_swab64 #endif /* __mips64 */ -#endif /* MIPS R2 or newer or Loongson 3A */ +#endif /* (not __mips16) and (MIPS R2 or newer or Loongson 3A) */ #endif /* _ASM_SWAB_H */ --- -1.7.10.4 - |