Commit 780d2bf3 authored Mar 17, 2014 by Arnd Bergmann

Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into next/soc

Merge "Allwinner core additions for 3.15" from Maxime Ripard:

Just a minor commit to adjust the restart code to take into account the new
compatibles

* tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux

:
  ARM: sunxi: Add the new watchog compatibles to the reboot code

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents e7f274dc 8db21ad4

arch/arm/mach-sunxi/sunxi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -94,8 +94,8 @@ static void sun6i_restart(enum reboot_mode mode, const char *cmd)
		}

		static struct of_device_id sunxi_restart_ids[] = {
		{ .compatible = "allwinner,sun4i-wdt" },
		{ .compatible = "allwinner,sun6i-wdt" },
		{ .compatible = "allwinner,sun4i-a10-wdt" },
		{ .compatible = "allwinner,sun6i-a31-wdt" },
		{ /sentinel/ }
		};

Admin message