Hi!
acpi_disable() is there already to disable interrupts. Its bad idea to
have two functions of same name. Please apply,
Pavel
Index: linux.new/arch/i386/kernel/dmi_scan.c
===================================================================
--- linux.new.orig/arch/i386/kernel/dmi_scan.c 2003-12-25 13:28:48.000000000 +0100
+++ linux.new/arch/i386/kernel/dmi_scan.c 2003-12-25 13:29:08.000000000 +0100
@@ -506,7 +507,7 @@
extern int acpi_disabled, acpi_force;
-static __init __attribute__((unused)) int acpi_disable(struct dmi_blacklist *d)
+static __init __attribute__((unused)) int disable_acpi(struct dmi_blacklist *d)
{
if (!acpi_force) {
printk(KERN_NOTICE "%s detected: acpi off\n",d->ident);
@@ -880,7 +881,7 @@
* Boxes that need ACPI disabled
*/
- { acpi_disable, "IBM Thinkpad", {
+ { disable_acpi, "IBM Thinkpad", {
MATCH(DMI_BOARD_VENDOR, "IBM"),
MATCH(DMI_BOARD_NAME, "2629H1G"),
NO_MATCH, NO_MATCH }},
--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo _at_ vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/