Commit 1ee6dd77 authored by Ralf Baechle's avatar Ralf Baechle Committed by Jeff Garzik

s2io: De-typedef driver.

Removed namespace collisions due to usage of nic_t as per Ralf's patch
Signed-off-by: default avatarSivakumar Subramani <sivakumar.subramani@neterion.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a113ae06
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#define TBD 0 #define TBD 0
typedef struct _XENA_dev_config { struct XENA_dev_config {
/* Convention: mHAL_XXX is mask, vHAL_XXX is value */ /* Convention: mHAL_XXX is mask, vHAL_XXX is value */
/* General Control-Status Registers */ /* General Control-Status Registers */
...@@ -852,9 +852,9 @@ typedef struct _XENA_dev_config { ...@@ -852,9 +852,9 @@ typedef struct _XENA_dev_config {
#define SPI_CONTROL_DONE BIT(6) #define SPI_CONTROL_DONE BIT(6)
u64 spi_data; u64 spi_data;
#define SPI_DATA_WRITE(data,len) vBIT(data,0,len) #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) #define XENA_EEPROM_SPACE (0x01 << 11)
#endif /* _REGS_H */ #endif /* _REGS_H */
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment