diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
| commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
| tree | 74800e35129775413c13ce7caf036ca19e3ce56c /drivers/acpi/Makefile | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
| parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) | |
| download | kernel_samsung_smdk4412-5028770a42e7bc4d15791a44c28f0ad539323807.tar.gz kernel_samsung_smdk4412-5028770a42e7bc4d15791a44c28f0ad539323807.tar.bz2 kernel_samsung_smdk4412-5028770a42e7bc4d15791a44c28f0ad539323807.zip | |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 65c92e20566..ad67e8f61e6 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -36,13 +36,14 @@ processor-objs += processor_perflib.o endif obj-$(CONFIG_ACPI_BUS) += sleep/ -obj-$(CONFIG_ACPI_BUS) += bus.o +obj-$(CONFIG_ACPI_BUS) += bus.o glue.o obj-$(CONFIG_ACPI_AC) += ac.o obj-$(CONFIG_ACPI_BATTERY) += battery.o obj-$(CONFIG_ACPI_BUTTON) += button.o obj-$(CONFIG_ACPI_EC) += ec.o obj-$(CONFIG_ACPI_FAN) += fan.o -obj-$(CONFIG_ACPI_VIDEO) += video.o +obj-$(CONFIG_ACPI_VIDEO) += video.o +obj-$(CONFIG_ACPI_HOTKEY) += hotkey.o obj-$(CONFIG_ACPI_PCI) += pci_root.o pci_link.o pci_irq.o pci_bind.o obj-$(CONFIG_ACPI_POWER) += power.o obj-$(CONFIG_ACPI_PROCESSOR) += processor.o |