kernel: b53: fix build with brcm47xx
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 3 Jul 2015 23:27:21 +0000 (23:27 +0000)
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 3 Jul 2015 23:27:21 +0000 (23:27 +0000)
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

target/linux/generic/files/drivers/net/phy/b53/b53_priv.h

index 4336fdb..0c4c394 100644 (file)
@@ -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)
 {