aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io-regs.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-01-31 14:09:29 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-05 16:58:52 -0500
commit1ee6dd770b2302e32fdae489f4fc58c374399da4 (patch)
tree214cab7727878b153ac0532d653667408fb9d744 /drivers/net/s2io-regs.h
parenta113ae066de6fc7ed33a6f420ea7dd2716a1920a (diff)
s2io: De-typedef driver.
Removed namespace collisions due to usage of nic_t as per Ralf's patch Signed-off-by: Sivakumar Subramani <sivakumar.subramani@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/s2io-regs.h')
-rw-r--r--drivers/net/s2io-regs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 518e96d75371..0e345cbc2bf9 100644
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -15,7 +15,7 @@
15 15
16#define TBD 0 16#define TBD 0
17 17
18typedef struct _XENA_dev_config { 18struct XENA_dev_config {
19/* Convention: mHAL_XXX is mask, vHAL_XXX is value */ 19/* Convention: mHAL_XXX is mask, vHAL_XXX is value */
20 20
21/* General Control-Status Registers */ 21/* General Control-Status Registers */
@@ -852,9 +852,9 @@ typedef struct _XENA_dev_config {
852#define SPI_CONTROL_DONE BIT(6) 852#define SPI_CONTROL_DONE BIT(6)
853 u64 spi_data; 853 u64 spi_data;
854#define SPI_DATA_WRITE(data,len) vBIT(data,0,len) 854#define SPI_DATA_WRITE(data,len) vBIT(data,0,len)
855} XENA_dev_config_t; 855};
856 856
857#define XENA_REG_SPACE sizeof(XENA_dev_config_t) 857#define XENA_REG_SPACE sizeof(struct XENA_dev_config)
858#define XENA_EEPROM_SPACE (0x01 << 11) 858#define XENA_EEPROM_SPACE (0x01 << 11)
859 859
860#endif /* _REGS_H */ 860#endif /* _REGS_H */