projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
577aa3b
)
net: macb: Remove redundant #ifdef CONFIG_DM_ETH
author
Wenyou Yang
<wenyou.yang@atmel.com>
Wed, 2 Nov 2016 02:06:57 +0000
(10:06 +0800)
committer
Joe Hershberger
<joe.hershberger@ni.com>
Tue, 7 Feb 2017 16:54:31 +0000
(10:54 -0600)
Remove the redundant #ifdef CONFIG_DM_ETH/#endif.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
drivers/net/macb.c
patch
|
blob
|
history
diff --git
a/drivers/net/macb.c
b/drivers/net/macb.c
index f97b82afdd1ea85ab90b79c634a5f22cabd2fdbd..67d820fefa591c260d34b956cdac994c27ed9c4e 100644
(file)
--- a/
drivers/net/macb.c
+++ b/
drivers/net/macb.c
@@
-1030,8
+1030,6
@@
static int macb_eth_probe(struct udevice *dev)
{
struct eth_pdata *pdata = dev_get_platdata(dev);
struct macb_device *macb = dev_get_priv(dev);
-
-#ifdef CONFIG_DM_ETH
const char *phy_mode;
int ret;
@@
-1042,7
+1040,6
@@
static int macb_eth_probe(struct udevice *dev)
debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
return -EINVAL;
}
-#endif
macb->regs = (void *)pdata->iobase;