diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
| commit | 47bf31adc541bef0c20de15e800e0011f1ae70c7 (patch) | |
| tree | 28903879a8570eaefa57942ec3d475d365f5a465 /drivers/acpi/Makefile | |
| parent | 4538fad56ee1c16bce0294b5647d2551f0e03164 (diff) | |
| parent | 0a918a9432cc30aede10f904253b66ea6ab485ac (diff) | |
| download | op-kernel-dev-47bf31adc541bef0c20de15e800e0011f1ae70c7.zip op-kernel-dev-47bf31adc541bef0c20de15e800e0011f1ae70c7.tar.gz | |
Merge branch 'dock' into test
Conflicts:
drivers/acpi/osl.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, 0 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 52a4cd4..ad4bfd5 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -45,7 +45,6 @@ obj-$(CONFIG_ACPI_BATTERY) += battery.o obj-$(CONFIG_ACPI_BUTTON) += button.o obj-$(CONFIG_ACPI_FAN) += fan.o obj-$(CONFIG_ACPI_DOCK) += dock.o -obj-$(CONFIG_ACPI_BAY) += bay.o obj-$(CONFIG_ACPI_VIDEO) += video.o obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o |
