git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
drivers
/
acpi
/
dock.c
diff --git
a/drivers/acpi/dock.c
b/drivers/acpi/dock.c
index
96c542f
..
bb7c51f
100644
(file)
--- a/
drivers/acpi/dock.c
+++ b/
drivers/acpi/dock.c
@@
-917,6
+917,9
@@
static int __init dock_init(void)
dock_station = NULL;
+ if (acpi_disabled)
+ return 0;
+
/* look for a dock station */
acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, find_dock, &num, NULL);