Re: [2.4 patch] fix IPMI compile with new ACPI

From: Corey Minyard (cminyard@mvista.com)
Date: Sun Jun 22 2003 - 16:37:13 EST


Cool, they've fixed the ACPI stuff. It looks good, please apply.

-Corey

Adrian Bunk wrote:

>The patch below fixes the compilation of ipmi_kcs_intf.c in 2.4.22-pre1.
>
>The changes are:
>- remove two now unneeded includes (since the files moved there was a
> compile error, but they are indirectly included via linux/acpi.h)
>- remove unneeded COMPILER_DEPENDENT_UINT64; besides that it's
> unneeded it was wrong on 32 bit architectures
>- s/acpi_table_header/struct acpi_table_header/
>
>-ac contains a similar patch that differs because it also adds
>#include's for acpi/acpi.h and acpi/actypes.h (indirectly included via
>linux/acpi.h).
>
>cu
>Adrian
>
>--- linux-2.4.22-pre1-full/drivers/char/ipmi/ipmi_kcs_intf.c.old 2003-06-22 01:28:28.000000000 +0200
>+++ linux-2.4.22-pre1-full/drivers/char/ipmi/ipmi_kcs_intf.c 2003-06-22 01:40:12.000000000 +0200
>@@ -1031,10 +1031,6 @@
> from Hewlett-Packard simple bmc.c, a GPL KCS driver. */
>
> #include <linux/acpi.h>
>-/* A real hack, but everything's not there yet in 2.4. */
>-#define COMPILER_DEPENDENT_UINT64 unsigned long
>-#include <../drivers/acpi/include/acpi.h>
>-#include <../drivers/acpi/include/actypes.h>
>
> struct SPMITable {
> s8 Signature[4];
>@@ -1059,7 +1055,7 @@
> static unsigned long acpi_find_bmc(void)
> {
> acpi_status status;
>- acpi_table_header *spmi;
>+ struct acpi_table_header *spmi;
> static unsigned long io_base = 0;
>
> if (io_base != 0)
>
>
>
>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Jun 23 2003 - 22:00:39 EST