projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
net
/
ethernet
/
amd
/
au1000_eth.h
diff --git
a/drivers/net/ethernet/amd/au1000_eth.h
b/drivers/net/ethernet/amd/au1000_eth.h
index
6229c77
..
4b7f7ad
100644
(file)
--- a/
drivers/net/ethernet/amd/au1000_eth.h
+++ b/
drivers/net/ethernet/amd/au1000_eth.h
@@
-124,7
+124,7
@@
struct au1000_private {
*/
struct mac_reg *mac; /* mac registers */
u32 *enable; /* address of MAC Enable Register */
*/
struct mac_reg *mac; /* mac registers */
u32 *enable; /* address of MAC Enable Register */
-
+ void __iomem *macdma; /* base of MAC DMA port */
u32 vaddr; /* virtual address of rx/tx buffers */
dma_addr_t dma_addr; /* dma address of rx/tx buffers */
u32 vaddr; /* virtual address of rx/tx buffers */
dma_addr_t dma_addr; /* dma address of rx/tx buffers */