summaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-09-25 05:14:45 +0200
committerDave Airlie <airlied@linux.ie>2005-09-25 05:14:45 +0200
commit4e0c1159d83a658d1ffba5bc3442f4ec4cadb436 (patch)
tree36a5079ba7ba9b9e0f2f633356705b980940eac4 /drivers/Makefile
parentdrm: add radeon PCI express support (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-ucb (diff)
downloadlinux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.tar.xz
linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.zip
update from upstream
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 9663132ed825..1a109a6dd953 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -8,7 +8,7 @@
obj-$(CONFIG_PCI) += pci/
obj-$(CONFIG_PARISC) += parisc/
obj-y += video/
-obj-$(CONFIG_ACPI_BOOT) += acpi/
+obj-$(CONFIG_ACPI) += acpi/
# PnP must come after ACPI since it will eventually need to check if acpi
# was used and do nothing if so
obj-$(CONFIG_PNP) += pnp/
@@ -17,6 +17,8 @@ obj-$(CONFIG_PNP) += pnp/
# default.
obj-y += char/
+obj-$(CONFIG_CONNECTOR) += connector/
+
# i810fb and intelfb depend on char/agp/
obj-$(CONFIG_FB_I810) += video/i810/
obj-$(CONFIG_FB_INTEL) += video/intelfb/