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-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -65,7 +65,7 @@ static struct at91_udc_data __initdata snapper9260_udc_data = {
 	.vbus_polled		= 1,
 };

-static struct at91_eth_data snapper9260_macb_data = {
+static struct macb_platform_data snapper9260_macb_data = {
 	.is_rmii	= 1,
 };