diff options
author | 2010-08-15 01:06:31 -0400 | |
---|---|---|
committer | 2010-08-15 01:06:31 -0400 | |
commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
tree | e5a05c7297f997e191c73091934e42e3195c0e40 /drivers/acpi/Makefile | |
parent | gcc-4.6: ACPI: fix unused but set variables in ACPI (diff) | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
download | linux-95ee46aa8698f2000647dfb362400fadbb5807cf.tar.gz linux-95ee46aa8698f2000647dfb362400fadbb5807cf.tar.bz2 linux-95ee46aa8698f2000647dfb362400fadbb5807cf.zip |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 3f0449622e69..3d031d02e54b 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_POWER_METER) += power_meter.o obj-$(CONFIG_ACPI_HED) += hed.o +obj-$(CONFIG_ACPI_EC_DEBUGFS) += ec_sys.o # processor has its own "processor." module_param namespace processor-y := processor_driver.o processor_throttling.o |