diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:11:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:11:43 -0700 |
| commit | 45ea2103d8856454503b30464cc1dba378748d00 (patch) | |
| tree | f045cfc184e4103252d670145d18778220a5a3c1 /arch/x86/kernel/reboot.c | |
| parent | 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b (diff) | |
| parent | 62179849b40aded9e727cca5006627a1c4d6446e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix setup printk format warning
x86: olpc build fix
x86: video/fbdev.c: add MODULE_LICENSE
x86: fix up bootparam.h for userspace inclusion
x86: relocs ELF handling - use SELFMAG instead of numeric constant
x86: vdso ELF handling - use SELFMAG instead of numeric constant
x86: remove dell reboot dmi quirk board name match
x86: es7000 build fix
x86: make additional_cpus static
x86: make start_secondary() static
kbuild, suspend, x86: fix rebuild of wakeup.bin
uml: fix gcc problem
x86: undo visws/numaq build changes
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 07c6d42ab5f..f6be7d5f82f 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*/ |