diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
| commit | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (patch) | |
| tree | 29649f48b92b92342183f71565c34afeca0b1735 /drivers/net | |
| parent | c71645ad2bd5179ad21e2501c26f574e9688f02a (diff) | |
| parent | 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 (diff) | |
| download | talos-obmc-uboot-519fdde9e6a6ebce7dc743b4f5621503d25b7a45.tar.gz talos-obmc-uboot-519fdde9e6a6ebce7dc743b4f5621503d25b7a45.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/designware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/designware.h b/drivers/net/designware.h index afeaccec19..382b0c7f0a 100644 --- a/drivers/net/designware.h +++ b/drivers/net/designware.h @@ -110,7 +110,7 @@ struct dmamacdescr { u32 dmamac_cntl; void *dmamac_addr; struct dmamacdescr *dmamac_next; -} __aligned(16); +} __aligned(ARCH_DMA_MINALIGN); /* * txrx_status definitions |
