/[pkg-src]/trunk/kernel26-xen/patches-2.6.25-r1/1027-2.6.25-xen-ACPI-thermal-Compile-without-CONFIG_DMI.patch |
Contents of /trunk/kernel26-xen/patches-2.6.25-r1/1027-2.6.25-xen-ACPI-thermal-Compile-without-CONFIG_DMI.patch
Parent Directory | Revision Log
Revision 606 -
(show annotations)
(download)
Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
File size: 933 byte(s)
Thu May 22 23:13:13 2008 UTC (15 years, 11 months ago) by niro
File size: 933 byte(s)
-ver bump to 2.6.25-magellan-r1: - linux-2.6.25.4 - fbcondecor-0.9.4 - squashfs-3.3 - unionfs-2.3.3 - tuxonice-3.0-rc7 - linux-phc-0.3.0 - acpi-dstd-0.9a - reiser4 - xen-3.2.0 . ipw3945-1.2.2
1 | From 676d91bc6972b8fe9d2dfa49960c917e80f8f8a8 Mon Sep 17 00:00:00 2001 |
2 | From: Eduardo Habkost <ehabkost@redhat.com> |
3 | Date: Tue, 4 Mar 2008 16:59:48 -0300 |
4 | Subject: [PATCH] ACPI: thermal: Compile without CONFIG_DMI |
5 | |
6 | Add a macro for thermal_dmi_table to allow the driver to build if |
7 | CONFIG_DMI is not set. |
8 | |
9 | Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> |
10 | Signed-off-by: Mark McLoughlin <markmc@redhat.com> |
11 | --- |
12 | drivers/acpi/thermal.c | 5 +++++ |
13 | 1 files changed, 5 insertions(+), 0 deletions(-) |
14 | |
15 | diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c |
16 | index 1bcecc7..f044a66 100644 |
17 | --- a/drivers/acpi/thermal.c |
18 | +++ b/drivers/acpi/thermal.c |
19 | @@ -1785,6 +1785,11 @@ static struct dmi_system_id thermal_dmi_table[] __initdata = { |
20 | }, |
21 | {} |
22 | }; |
23 | +#else |
24 | + |
25 | +/* Just that the dmi_check_system() call below compiles */ |
26 | +#define thermal_dmi_table NULL |
27 | + |
28 | #endif /* CONFIG_DMI */ |
29 | |
30 | static int __init acpi_thermal_init(void) |
31 | -- |
32 | 1.5.4.1 |
33 |