aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-07-03 23:27:21 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-07-03 23:27:21 +0000
commit9ca5a98cd2d95a269ded87cc5f40fe39442c3a4b (patch)
tree8a9600476adc68f018174fa10054831a8ad1b789 /target/linux/generic
parent53429129dadbc10822d2b90627ec0fac986d1223 (diff)
downloadmaster-187ad058-9ca5a98cd2d95a269ded87cc5f40fe39442c3a4b.tar.gz
master-187ad058-9ca5a98cd2d95a269ded87cc5f40fe39442c3a4b.tar.bz2
master-187ad058-9ca5a98cd2d95a269ded87cc5f40fe39442c3a4b.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46170 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-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)
{