diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-10 00:24:09 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-10 00:24:09 +0200 |
commit | 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch) | |
tree | 3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /arch/x86/kernel/reboot.c | |
parent | [ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier. (diff) | |
parent | [ARM] Orion: clean up addr-map.c after window setting code purge (diff) | |
download | linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.tar.xz linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.zip |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'arch/x86/kernel/reboot.c')
-rw-r--r-- | arch/x86/kernel/reboot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 07c6d42ab5ff..f6be7d5f82f8 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -149,7 +149,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"), - DMI_MATCH(DMI_BOARD_NAME, "0WF810"), }, }, { /* Handle problems with rebooting on Dell Optiplex 745's DFF*/ |