diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
| commit | 0a637bcc3c66c647f52970ddd1dbae2d749dc969 (patch) | |
| tree | 55ccc56a785cac9a3b990130f70316869ee77b47 /drivers/net/macb.c | |
| parent | dd9f6d08a2736bf8ddc0004779c563a4c3a77cef (diff) | |
| parent | c6ef15b3879607a9e31964fc8942f95c253122f9 (diff) | |
| download | barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.gz barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.xz | |
Merge branch 'for-next/zynq'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 5ea8470ba3..b1f544b5ab 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -43,7 +43,7 @@ #include <init.h> #include <errno.h> #include <io.h> -#include <mach/board.h> +#include <platform_data/macb.h> #include <linux/clk.h> #include <linux/err.h> #include <asm/mmu.h> @@ -307,6 +307,7 @@ static void macb_configure_dma(struct macb_device *bp) dmacfg |= GEM_BF(FBLDO, 16); dmacfg |= GEM_BIT(TXPBMS) | GEM_BF(RXBMS, -1L); dmacfg |= GEM_BIT(DDRP); + dmacfg &= ~GEM_BIT(ENDIA); gem_writel(bp, DMACFG, dmacfg); } } @@ -584,7 +585,7 @@ static int macb_probe(struct device_d *dev) struct eth_device *edev; struct macb_device *macb; u32 ncfgr; - struct at91_ether_platform_data *pdata; + struct macb_platform_data *pdata; if (!dev->platform_data) { dev_err(dev, "macb: no platform_data\n"); |