aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-07-03 23:27:21 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-07-03 23:27:21 +0000
commitd0aca89c18f39a3f64ad94bfde62231994f82a44 (patch)
tree35b3ba5e0ab179eaa762267cb23240d08cf9d0bc
parent97b14fd70037aa1d10bbd0b2ed67efd82e160c56 (diff)
downloadupstream-d0aca89c18f39a3f64ad94bfde62231994f82a44.tar.gz
upstream-d0aca89c18f39a3f64ad94bfde62231994f82a44.tar.bz2
upstream-d0aca89c18f39a3f64ad94bfde62231994f82a44.zip
kernel: b53: fix build with brcm47xx
The position of the nvram header file on brcm47xx changed with kernel version 4.1. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46170
-rw-r--r--target/linux/generic/files/drivers/net/phy/b53/b53_priv.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h b/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
index 4336fdba66..0c4c394b4f 100644
--- a/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
+++ b/target/linux/generic/files/drivers/net/phy/b53/b53_priv.h
@@ -301,7 +301,12 @@ static inline int b53_write64(struct b53_device *dev, u8 page, u8 reg,
#ifdef CONFIG_BCM47XX
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
+#include <linux/bcm47xx_nvram.h>
+#else
#include <bcm47xx_nvram.h>
+#endif
#include <bcm47xx_board.h>
static inline int b53_switch_get_reset_gpio(struct b53_device *dev)
{