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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[pandora-kernel.git]
/
include
/
linux
/
stmmac.h
diff --git
a/include/linux/stmmac.h
b/include/linux/stmmac.h
index
32bfd1a
..
632ff7c
100644
(file)
--- a/
include/linux/stmmac.h
+++ b/
include/linux/stmmac.h
@@
-33,6
+33,7
@@
struct plat_stmmacenet_data {
int bus_id;
int pbl;
int has_gmac;
+ int enh_desc;
void (*fix_mac_speed)(void *priv, unsigned int speed);
void (*bus_setup)(unsigned long ioaddr);
#ifdef CONFIG_STM_DRIVERS