From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 3 Jul 2015 23:27:21 +0000 (+0000)
Subject: kernel: b53: fix build with brcm47xx
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d0aca89c18f39a3f64ad94bfde62231994f82a44;p=openwrt%2Fstaging%2Fsvanheule.git

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
---

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)
 {