diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 15:44:55 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 15:44:55 +0000 |
commit | ed20178d6266e0b9c9370e6862ac1eadadb8b321 (patch) | |
tree | 91cd87e854b53e43c6ec288d1e4dfc261fbbb677 /drivers/net/ethernet/cadence/at91_ether.h | |
parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
download | blackbird-op-linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.gz blackbird-op-linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.zip |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'drivers/net/ethernet/cadence/at91_ether.h')
-rw-r--r-- | drivers/net/ethernet/cadence/at91_ether.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/at91_ether.h b/drivers/net/ethernet/cadence/at91_ether.h index 353f4dab62be..3725fbb0defe 100644 --- a/drivers/net/ethernet/cadence/at91_ether.h +++ b/drivers/net/ethernet/cadence/at91_ether.h @@ -85,7 +85,9 @@ struct recv_desc_bufs struct at91_private { struct mii_if_info mii; /* ethtool support */ - struct at91_eth_data board_data; /* board-specific configuration */ + struct macb_platform_data board_data; /* board-specific + * configuration (shared with + * macb for common data */ struct clk *ether_clk; /* clock */ /* PHY */ |