From 1ee6dd770b2302e32fdae489f4fc58c374399da4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 31 Jan 2007 14:09:29 -0500 Subject: s2io: De-typedef driver. Removed namespace collisions due to usage of nic_t as per Ralf's patch Signed-off-by: Sivakumar Subramani Signed-off-by: Jeff Garzik --- drivers/net/s2io-regs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/net/s2io-regs.h') diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h index 518e96d7537..0e345cbc2bf 100644 --- a/drivers/net/s2io-regs.h +++ b/drivers/net/s2io-regs.h @@ -15,7 +15,7 @@ #define TBD 0 -typedef struct _XENA_dev_config { +struct XENA_dev_config { /* Convention: mHAL_XXX is mask, vHAL_XXX is value */ /* General Control-Status Registers */ @@ -852,9 +852,9 @@ typedef struct _XENA_dev_config { #define SPI_CONTROL_DONE BIT(6) u64 spi_data; #define SPI_DATA_WRITE(data,len) vBIT(data,0,len) -} XENA_dev_config_t; +}; -#define XENA_REG_SPACE sizeof(XENA_dev_config_t) +#define XENA_REG_SPACE sizeof(struct XENA_dev_config) #define XENA_EEPROM_SPACE (0x01 << 11) #endif /* _REGS_H */ -- cgit v1.2.3-70-g09d2