diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 07:38:16 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 07:38:16 +0100 |
| commit | eee3c859c486d4f110f154807430eaf825ff4a3d (patch) | |
| tree | 8b378d16103b3d77a673e26fab0a6812459bab77 /drivers/acpi/Makefile | |
| parent | ACPI: bay: Convert ACPI Bay driver to be compatible with sysfs update. (diff) | |
| parent | PNPACPI: remove EXPERIMENTAL dependency (diff) | |
| download | linux-eee3c859c486d4f110f154807430eaf825ff4a3d.tar.xz linux-eee3c859c486d4f110f154807430eaf825ff4a3d.zip | |
Pull motherboard into test branch
Conflicts:
drivers/acpi/motherboard.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 399b0e8c41c4..856c32bccacb 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -37,7 +37,7 @@ endif obj-y += sleep/ obj-y += bus.o glue.o -obj-y += scan.o motherboard.o +obj-y += scan.o obj-$(CONFIG_ACPI_AC) += ac.o obj-$(CONFIG_ACPI_BATTERY) += battery.o obj-$(CONFIG_ACPI_BUTTON) += button.o |