diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-at91rm9200/at91sam9260_devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/board-sam9260ek.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91rm9200/at91sam9260_devices.c b/arch/arm/mach-at91rm9200/at91sam9260_devices.c index f42d3a40ec3c..f338f78eb943 100644 --- a/arch/arm/mach-at91rm9200/at91sam9260_devices.c +++ b/arch/arm/mach-at91rm9200/at91sam9260_devices.c | |||
@@ -128,7 +128,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} | |||
128 | 128 | ||
129 | #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE) | 129 | #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE) |
130 | static u64 eth_dmamask = 0xffffffffUL; | 130 | static u64 eth_dmamask = 0xffffffffUL; |
131 | static struct eth_platform_data eth_data; | 131 | static struct at91_eth_data eth_data; |
132 | 132 | ||
133 | static struct resource eth_resources[] = { | 133 | static struct resource eth_resources[] = { |
134 | [0] = { | 134 | [0] = { |
@@ -155,7 +155,7 @@ static struct platform_device at91sam9260_eth_device = { | |||
155 | .num_resources = ARRAY_SIZE(eth_resources), | 155 | .num_resources = ARRAY_SIZE(eth_resources), |
156 | }; | 156 | }; |
157 | 157 | ||
158 | void __init at91_add_device_eth(struct eth_platform_data *data) | 158 | void __init at91_add_device_eth(struct at91_eth_data *data) |
159 | { | 159 | { |
160 | if (!data) | 160 | if (!data) |
161 | return; | 161 | return; |
@@ -192,7 +192,7 @@ void __init at91_add_device_eth(struct eth_platform_data *data) | |||
192 | platform_device_register(&at91sam9260_eth_device); | 192 | platform_device_register(&at91sam9260_eth_device); |
193 | } | 193 | } |
194 | #else | 194 | #else |
195 | void __init at91_add_device_eth(struct eth_platform_data *data) {} | 195 | void __init at91_add_device_eth(struct at91_eth_data *data) {} |
196 | #endif | 196 | #endif |
197 | 197 | ||
198 | 198 | ||
diff --git a/arch/arm/mach-at91rm9200/board-sam9260ek.c b/arch/arm/mach-at91rm9200/board-sam9260ek.c index da5d58ac870b..37c7a7d195c3 100644 --- a/arch/arm/mach-at91rm9200/board-sam9260ek.c +++ b/arch/arm/mach-at91rm9200/board-sam9260ek.c | |||
@@ -118,7 +118,7 @@ static struct spi_board_info ek_spi_devices[] = { | |||
118 | /* | 118 | /* |
119 | * MACB Ethernet device | 119 | * MACB Ethernet device |
120 | */ | 120 | */ |
121 | static struct __initdata eth_platform_data ek_macb_data = { | 121 | static struct __initdata at91_eth_data ek_macb_data = { |
122 | .phy_irq_pin = AT91_PIN_PA7, | 122 | .phy_irq_pin = AT91_PIN_PA7, |
123 | .is_rmii = 1, | 123 | .is_rmii = 1, |
124 | }; | 124 | }; |