diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-22 02:27:40 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-22 02:27:40 -0400 |
| commit | f79e3185dd0f8650022518d7624c876d8929061b (patch) | |
| tree | 4cec3a434036031b4e2d4fef608f5523fb21c829 /arch | |
| parent | e8b495fe09bc793ae26774e7b2667f7f658d56e2 (diff) | |
| parent | 8b8eb7d8cfc6cd95ed00cd58754e8493322505bd (diff) | |
| download | linux-f79e3185dd0f8650022518d7624c876d8929061b.tar.bz2 | |
Pull misc into release branch
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index b87cedeaf59b..cacdd883bf2b 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -986,14 +986,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { }, { .callback = force_acpi_ht, - .ident = "DELL GX240", - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "Dell Computer Corporation"), - DMI_MATCH(DMI_BOARD_NAME, "OptiPlex GX240"), - }, - }, - { - .callback = force_acpi_ht, .ident = "HP VISUALIZE NT Workstation", .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), |