]> err.no Git - linux-2.6/commit
[ARM] 4119/1: AT91: Fix build of AT91SAM9260
authorAndrew Victor <andrew@sanpeople.com>
Thu, 1 Feb 2007 08:22:23 +0000 (09:22 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Feb 2007 14:50:53 +0000 (14:50 +0000)
commita93d48cc6019f84394b31d10c0d830a3b71696be
tree9b39c44631e1c6de0336a02e56e4e6f446761069
parentae0a846e411dc0b568e8ccda584896310ee5f369
[ARM] 4119/1: AT91: Fix build of AT91SAM9260

Fix build failure of AT91SAM9260.

The AT91RM9200 ethernet driver (at91_ether.c) stores platform data in a
"struct at91_eth_data" structure, but the AT91SAM9260 (and AT91SAM9263)
ethernet driver (macb.c) [developed on the AVR32 architecture] expects a
"struct eth_platform_data".

Since the platform data of the two drivers is very similar, we continue
to use the "struct at91_eth_data" for all AT91 processors but add a
    #define eth_platform_data      at91_eth_data
in board.h to keep the MACB driver happy.

Original patch by Jan Altenberg.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-at91rm9200/at91sam9260_devices.c
arch/arm/mach-at91rm9200/board-sam9260ek.c
include/asm-arm/arch-at91rm9200/board.h