diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
| commit | cdbfc557c43ea1f1f9b7062300ecb1254969814b (patch) | |
| tree | 255f1cf62cea2c3dec208799a00a116e714a6128 /drivers/acpi/dock.c | |
| parent | 4d8cc874d7ed43eda72765e9c0e141e170fee4f3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 96c542f7fde..1e872e79db3 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -917,6 +917,12 @@ static int __init dock_init(void) dock_station = NULL; + if (acpi_disabled) + return 0; + + 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); |