From: Hanjun Guo Date: Sun, 22 Sep 2013 11:05:47 +0000 (+0800) Subject: Staging / quickstart: remove reduplicate if(acpi_disabled) check X-Git-Tag: v3.13-rc1~170^2~613 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11f9c3218beeebdd86157949ccdfff1c9f82ff75;p=thirdparty%2Fkernel%2Fstable.git Staging / quickstart: remove reduplicate if(acpi_disabled) check In acpi_bus_register_driver(), there is an if (acpi_disabled) check, so the if(acpi_disabled) before it is reduplicate, remove it. Signed-off-by: Hanjun Guo Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/quickstart/quickstart.c b/drivers/staging/quickstart/quickstart.c index 4247d60c91861..9f6ebdb237405 100644 --- a/drivers/staging/quickstart/quickstart.c +++ b/drivers/staging/quickstart/quickstart.c @@ -390,10 +390,6 @@ static int __init quickstart_init(void) { int ret; - /* ACPI Check */ - if (acpi_disabled) - return -ENODEV; - /* ACPI driver register */ ret = acpi_bus_register_driver(&quickstart_acpi_driver); if (ret)