diff options
| author |   Dale Farnsworth <dale@farnsworth.org> | 2007-03-01 16:31:48 -0700 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-03-02 20:16:10 -0500 |
| commit | 5ada386bad58f023686b17113496ff626f10773f (patch) | |
| tree | 329a34f189f07987d5ec45c874ecb5d6f60b1259 /include/linux/mv643xx.h | |
| parent | Fix mv643xx_eth compilation. (diff) | |
| download | linux-dev-5ada386bad58f023686b17113496ff626f10773f.tar.xz linux-dev-5ada386bad58f023686b17113496ff626f10773f.zip | |
mv643xx_eth: move mac_addr inside mv643xx_eth_platform_data
The information contained within platform_data should be self-contained.
Replace the pointer to a MAC address with the actual MAC address in
struct mv643xx_eth_platform_data.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/mv643xx.h')
| -rw-r--r-- | include/linux/mv643xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h index aff25c000abf..e7d4da1cc9fa 100644 --- a/include/linux/mv643xx.h +++ b/include/linux/mv643xx.h @@ -1288,7 +1288,6 @@ struct mv64xxx_i2c_pdata { #define MV643XX_ETH_NAME "mv643xx_eth" struct mv643xx_eth_platform_data { - char *mac_addr; /* pointer to mac address */ u16 force_phy_addr; /* force override if phy_addr == 0 */ u16 phy_addr; @@ -1303,6 +1302,7 @@ struct mv643xx_eth_platform_data { u32 tx_sram_size; u32 rx_sram_addr; u32 rx_sram_size; + u8 mac_addr[6]; /* mac address if non-zero*/ }; #endif /* __ASM_MV643XX_H */ |