diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 12:22:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 12:22:30 -0700 |
| commit | 0acbbee440fadf45164cc9537ee7d528d045f2d6 (patch) | |
| tree | cbdb4d3f7fa97fd657f2e8e3489591dc444b9f23 /drivers/acpi/dock.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| parent | Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release (diff) | |
| download | linux-dev-0acbbee440fadf45164cc9537ee7d528d045f2d6.tar.xz linux-dev-0acbbee440fadf45164cc9537ee7d528d045f2d6.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled.
ACPI: don't walk tables if ACPI was disabled
thermal: Create CONFIG_THERMAL_HWMON=n
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 96c542f7fded..bb7c51f712bd 100644 --- 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); |