summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>2009-12-03 08:44:48 +0100
committerLen Brown <len.brown@intel.com>2009-12-09 21:54:30 +0100
commitb7fab7a0703a9d3a3b4b59aa2f7b098b2b83b8fe (patch)
tree6faa1f1c59a8c5338c7a41ff36863d3f343ea678 /drivers
parentasus-acpi: Remove redundant NULL checks (diff)
downloadlinux-b7fab7a0703a9d3a3b4b59aa2f7b098b2b83b8fe.tar.xz
linux-b7fab7a0703a9d3a3b4b59aa2f7b098b2b83b8fe.zip
asus-laptop: Remove uneccesary acpi_disabled check
acpi_bus_register_driver() already checks acpi_disabled, so acpi bus drivers don't need to. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/asus-laptop.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 8af43e9b6183..4234edbe6ffc 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1438,9 +1438,6 @@ static int __init asus_laptop_init(void)
{
int result;
- if (acpi_disabled)
- return -ENODEV;
-
result = acpi_bus_register_driver(&asus_hotk_driver);
if (result < 0)
return result;