diff options
| author | Linus Torvalds | 2011-05-29 20:19:16 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-05-29 20:19:16 +0200 |
| commit | daa94222b638bfe34f745d0982de7a165ce7f67c (patch) | |
| tree | 2157ed94339d46f7a2da22e22648a70319e8fdd0 /drivers/acpi/Makefile | |
| parent | Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge branch 'ec-cleanup' into release (diff) | |
| download | kernel-qcow2-linux-daa94222b638bfe34f745d0982de7a165ce7f67c.tar.gz kernel-qcow2-linux-daa94222b638bfe34f745d0982de7a165ce7f67c.tar.xz kernel-qcow2-linux-daa94222b638bfe34f745d0982de7a165ce7f67c.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:
ACPI EC: remove redundant code
ACPI: Add D3 cold state
ACPI: processor: fix processor_physically_present in UP kernel
ACPI: Split out custom_method functionality into an own driver
ACPI: Cleanup custom_method debug stuff
ACPI EC: enable MSI workaround for Quanta laptops
ACPICA: Update to version 20110413
ACPICA: Execute an orphan _REG method under the EC device
ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place
ACPICA: Update internal address SpaceID for DataTable regions
ACPICA: Add more methods eligible for NULL package element removal
ACPICA: Split all internal Global Lock functions to new file - evglock
ACPI: EC: add another DMI check for ASUS hardware
ACPI EC: remove dead code
ACPICA: Fix code divergence of global lock handling
ACPICA: Use acpi_os_create_lock interface
ACPI: osl, add acpi_os_create_lock interface
ACPI:Fix goto flows in thermal-sys
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index b66fbb2fc85f..ecb26b4f29a0 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -61,6 +61,7 @@ obj-$(CONFIG_ACPI_SBS) += sbshc.o obj-$(CONFIG_ACPI_SBS) += sbs.o obj-$(CONFIG_ACPI_HED) += hed.o obj-$(CONFIG_ACPI_EC_DEBUGFS) += ec_sys.o +obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o # processor has its own "processor." module_param namespace processor-y := processor_driver.o processor_throttling.o |