diff options
author | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /drivers/acpi/ec.c | |
parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) |
Merge ../linus
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r-- | drivers/acpi/ec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 79b09d76c180..eee0864ba300 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -1572,7 +1572,7 @@ static void __exit acpi_ec_exit(void) | |||
1572 | static int __init acpi_fake_ecdt_setup(char *str) | 1572 | static int __init acpi_fake_ecdt_setup(char *str) |
1573 | { | 1573 | { |
1574 | acpi_fake_ecdt_enabled = 1; | 1574 | acpi_fake_ecdt_enabled = 1; |
1575 | return 0; | 1575 | return 1; |
1576 | } | 1576 | } |
1577 | 1577 | ||
1578 | __setup("acpi_fake_ecdt", acpi_fake_ecdt_setup); | 1578 | __setup("acpi_fake_ecdt", acpi_fake_ecdt_setup); |
@@ -1591,7 +1591,7 @@ static int __init acpi_ec_set_intr_mode(char *str) | |||
1591 | acpi_ec_driver.ops.add = acpi_ec_poll_add; | 1591 | acpi_ec_driver.ops.add = acpi_ec_poll_add; |
1592 | } | 1592 | } |
1593 | printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling"); | 1593 | printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling"); |
1594 | return 0; | 1594 | return 1; |
1595 | } | 1595 | } |
1596 | 1596 | ||
1597 | __setup("ec_intr=", acpi_ec_set_intr_mode); | 1597 | __setup("ec_intr=", acpi_ec_set_intr_mode); |