From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 13 Mar 2018 09:20:08 +0000 (+0100)
Subject: kernel: b53: drop support for old location of bcm47xx_nvram.h
X-Git-Tag: v18.06.0-rc1~656
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9004fc3c76324f669df3ff402faf78dc847af58a;p=oweals%2Fopenwrt.git

kernel: b53: drop support for old location of bcm47xx_nvram.h

In kernels 4.0 and older that header file was located in some subdir of
arch/mips/include. Target brcm47xx supports kernels 4.4 and 4.9 only so
that code isn't needed anymore.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

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 277c75d367..0c0358206d 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
@@ -310,14 +310,12 @@ static inline int b53_write64(struct b53_device *dev, u8 page, u8 reg,
 }
 
 #ifdef CONFIG_BCM47XX
+#include <bcm47xx_board.h>
 
 #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)
 {
 	enum bcm47xx_board board = bcm47xx_board_get();