diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-04-20 13:51:21 +0800 |
commit | 663276faa26c2837eca83a5800b3668be19aaaff (patch) | |
tree | aee6a1964c83eb2153bde4a4c442af88204a28a8 /arch/x86 | |
parent | 667ea3959654ae48ef303df13f2635fd07766cb4 (diff) | |
parent | 5c43c539346972b9a1d5f38dc62db5a39997488d (diff) |
Merge tag 'v3.14.39' into linux-linaro-lsk-v3.14
This is the 3.14.39 stable release
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/reboot.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index c752cb43e52f..a6aa91f77654 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -181,6 +181,16 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, }, + /* ASRock */ + { /* Handle problems with rebooting on ASRock Q1900DC-ITX */ + .callback = set_pci_reboot, + .ident = "ASRock Q1900DC-ITX", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASRock"), + DMI_MATCH(DMI_BOARD_NAME, "Q1900DC-ITX"), + }, + }, + /* ASUS */ { /* Handle problems with rebooting on ASUS P4S800 */ .callback = set_bios_reboot, |