]> git.karo-electronics.de Git - linux-beck.git/commit
at91: merge board USB-A9260 and USB-A9263 together
authorNico Erfurth <ne@erfurth.eu>
Tue, 30 Aug 2011 16:25:52 +0000 (18:25 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 7 Sep 2011 14:33:56 +0000 (16:33 +0200)
commit6939fd49787e233fd0d7640a4de72815bc8c649a
treee8caeb5c0532f990a073df7cbaba9fdd6254341a
parent82cb86548259a71c154b1c2df728d8526b79846a
at91: merge board USB-A9260 and USB-A9263 together

Merge boards together as they are barely the same.

Signed-off-by: Nico Erfurth <ne@erfurth.eu>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
[nicolas.ferre@atmel.com: updated to new machine_desc structure]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Gregory Hermant <gregory.hermant@calao-systems.com>
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/board-usb-a9260.c [deleted file]
arch/arm/mach-at91/board-usb-a926x.c [moved from arch/arm/mach-at91/board-usb-a9263.c with 84% similarity]