git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
net
/
tulip
/
tulip.h
diff --git
a/drivers/net/tulip/tulip.h
b/drivers/net/tulip/tulip.h
index
e21e7c3
..
56d18cc
100644
(file)
--- a/
drivers/net/tulip/tulip.h
+++ b/
drivers/net/tulip/tulip.h
@@
-64,6
+64,8
@@
enum tbl_flag {
COMET_MAC_ADDR = 0x0800,
HAS_PCI_MWI = 0x1000,
HAS_PHY_IRQ = 0x2000,
COMET_MAC_ADDR = 0x0800,
HAS_PCI_MWI = 0x1000,
HAS_PHY_IRQ = 0x2000,
+ HAS_SWAPPED_SEEPROM = 0x4000,
+ NEEDS_FAKE_MEDIA_TABLE = 0x8000,
};
};
@@
-407,7
+409,7
@@
void pnic2_lnk_change(struct net_device *dev, int csr5);
/* eeprom.c */
void tulip_parse_eeprom(struct net_device *dev);
/* eeprom.c */
void tulip_parse_eeprom(struct net_device *dev);
-int tulip_read_eeprom(
long ioaddr
, int location, int addr_len);
+int tulip_read_eeprom(
struct net_device *dev
, int location, int addr_len);
/* interrupt.c */
extern unsigned int tulip_max_interrupt_work;
/* interrupt.c */
extern unsigned int tulip_max_interrupt_work;