Pull acpica into release branch

[pandora-kernel.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 1e32227..80cc76d 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1571,7 +1571,7 @@ static void __exit acpi_ec_exit(void)
 static int __init acpi_fake_ecdt_setup(char *str)
 {
        acpi_fake_ecdt_enabled = 1;
 static int __init acpi_fake_ecdt_setup(char *str)
 {
        acpi_fake_ecdt_enabled = 1;

-       return 0;
+       return 1;

 }
 
 __setup("acpi_fake_ecdt", acpi_fake_ecdt_setup);
 }
 
 __setup("acpi_fake_ecdt", acpi_fake_ecdt_setup);


@@ -1590,7 +1590,7 @@ static int __init acpi_ec_set_intr_mode(char *str)
                acpi_ec_driver.ops.add = acpi_ec_poll_add;
        }
        printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling");
                acpi_ec_driver.ops.add = acpi_ec_poll_add;
        }
        printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling");

-       return 0;
+       return 1;

 }
 
 __setup("ec_intr=", acpi_ec_set_intr_mode);
 }
 
 __setup("ec_intr=", acpi_ec_set_intr_mode);