shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-04 18:19:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2014-03-17 14:41:54 +01:00
parent e7f274dccf 8db21ad469
commit 780d2bf3d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-sunxi/sunxi.c
View File

@@ -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*/ }
};