1377916ea7
This reorders the patchs and adds some new ones. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 37586
22 lines
631 B
Diff
22 lines
631 B
Diff
bgmac: make bgmac work on systems without nvram
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/net/ethernet/broadcom/bgmac.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
|
@@ -16,7 +16,11 @@
|
|
#include <linux/phy.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/dma-mapping.h>
|
|
+#ifdef CONFIG_BCM47XX
|
|
#include <bcm47xx_nvram.h>
|
|
+#else
|
|
+#define bcm47xx_nvram_getenv(a, b, c) -1
|
|
+#endif
|
|
|
|
static const struct bcma_device_id bgmac_bcma_tbl[] = {
|
|
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
|