ARM: at91: Remove reset code from the machine code
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Thu, 3 Jul 2014 10:00:52 +0000 (12:00 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 25 Aug 2014 14:06:22 +0000 (16:06 +0200)
Now that the transition is over and that we probe our reset driver in every
case, we can remove the legacy code from the machine directory.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9_alt_reset.S [deleted file]
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9g45_reset.S [deleted file]
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/generic.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc arch/arm/mach-at91/at91sam9_alt_reset.S
Simple merge
Simple merge
diff --cc arch/arm/mach-at91/at91sam9g45_reset.S
Simple merge
Simple merge
Simple merge