git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
linux
/
davinci_emac.h
diff --git
a/include/linux/davinci_emac.h
b/include/linux/davinci_emac.h
index
6d894ef
..
7c930db
100644
(file)
--- a/
include/linux/davinci_emac.h
+++ b/
include/linux/davinci_emac.h
@@
-19,6
+19,7
@@
struct emac_platform_data {
u32 ctrl_reg_offset;
u32 ctrl_mod_reg_offset;
u32 ctrl_ram_offset;
+ u32 hw_ram_addr;
u32 mdio_reg_offset;
u32 ctrl_ram_size;
u32 phy_mask;