Skip to content

Commit

Permalink
s2io: De-typedef driver.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ralf Baechle authored and Jeff Garzik committed Feb 5, 2007
1 parent a113ae0 commit 1ee6dd7
Show file tree
Hide file tree
Showing 3 changed files with 362 additions and 351 deletions.
6 changes: 3 additions & 3 deletions drivers/net/s2io-regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Loading

0 comments on commit 1ee6dd7

Please sign in to comment.