Merge branch 'drivers/macb-gem-cleanup' into at91/gpio

2011-11-29 15:44:55 +00:00
parent d28bdfc5c8 c220f8cd01
commit ed20178d62
54 changed files with 157 additions and 171 deletions
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -123,7 +123,7 @@ static struct spi_board_info ek_spi_devices[] = {
 /*
 * MACB Ethernet device
 */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
 	.phy_irq_pin	= AT91_PIN_PA7,
 	.is_rmii	= 1,
 };