diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-12 03:15:50 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-12 03:15:50 +0100 |
| commit | f398778aa336a2919ee04ba45d915007230c6957 (patch) | |
| tree | c7244cd1d4af8d99c861b21ebcaeabf23e355b9f /drivers/acpi/Makefile | |
| parent | Merge branch 'sysfs' into release (diff) | |
| parent | thinkpad_acpi: fingers off backlight if video.ko is serving this functionality (diff) | |
| download | linux-f398778aa336a2919ee04ba45d915007230c6957.tar.xz linux-f398778aa336a2919ee04ba45d915007230c6957.zip | |
Merge branch 'video' into release
Conflicts:
Documentation/kernel-parameters.txt
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index fc622316a7d8..3c0c93300f12 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -46,6 +46,10 @@ obj-$(CONFIG_ACPI_BUTTON) += button.o obj-$(CONFIG_ACPI_FAN) += fan.o obj-$(CONFIG_ACPI_DOCK) += dock.o obj-$(CONFIG_ACPI_VIDEO) += video.o +ifdef CONFIG_ACPI_VIDEO +obj-y += video_detect.o +endif + obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o obj-$(CONFIG_ACPI_PROCESSOR) += processor.o |