vserver 1.9.5.x5

[linux-2.6.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index c767329..04fba9e 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -7,6 +7,7 @@
 
 obj-$(CONFIG_PCI)              += pci/
 obj-$(CONFIG_PARISC)           += parisc/
+obj-y                          += video/
 obj-$(CONFIG_ACPI_BOOT)                += acpi/
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so
@@ -15,6 +16,14 @@ obj-$(CONFIG_PNP)            += pnp/
 # char/ comes before serial/ etc so that the VT console is the boot-time
 # default.
 obj-y                          += char/
+
+# i810fb and intelfb depend on char/agp/
+obj-$(CONFIG_FB_I810)           += video/i810/
+obj-$(CONFIG_FB_INTEL)          += video/intelfb/
+
+# we also need input/serio early so serio bus is initialized by the time
+# serial drivers start registering their serio ports
+obj-$(CONFIG_SERIO)            += input/serio/
 obj-y                          += serial/
 obj-$(CONFIG_PARPORT)          += parport/
 obj-y                          += base/ block/ misc/ net/ media/
@@ -26,22 +35,23 @@ obj-$(CONFIG_FC4)           += fc4/
 obj-$(CONFIG_SCSI)             += scsi/
 obj-$(CONFIG_FUSION)           += message/
 obj-$(CONFIG_IEEE1394)         += ieee1394/
-obj-y                          += cdrom/ video/
+obj-y                          += cdrom/
 obj-$(CONFIG_MTD)              += mtd/
-obj-$(CONFIG_PCMCIA)           += pcmcia/
+obj-$(CONFIG_PCCARD)           += pcmcia/
 obj-$(CONFIG_DIO)              += dio/
 obj-$(CONFIG_SBUS)             += sbus/
 obj-$(CONFIG_ZORRO)            += zorro/
 obj-$(CONFIG_MAC)              += macintosh/
+obj-$(CONFIG_ATA_OVER_ETH)     += block/aoe/
 obj-$(CONFIG_PARIDE)           += block/paride/
 obj-$(CONFIG_TC)               += tc/
 obj-$(CONFIG_USB)              += usb/
 obj-$(CONFIG_USB_GADGET)       += usb/gadget/
 obj-$(CONFIG_INPUT)            += input/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
-obj-$(CONFIG_SERIO)            += input/serio/
 obj-$(CONFIG_I2O)              += message/
 obj-$(CONFIG_I2C)              += i2c/
+obj-$(CONFIG_W1)               += w1/
 obj-$(CONFIG_PHONE)            += telephony/
 obj-$(CONFIG_MD)               += md/
 obj-$(CONFIG_BT)               += bluetooth/
@@ -49,4 +59,7 @@ obj-$(CONFIG_ISDN)            += isdn/
 obj-$(CONFIG_MCA)              += mca/
 obj-$(CONFIG_EISA)             += eisa/
 obj-$(CONFIG_CPU_FREQ)         += cpufreq/
+obj-$(CONFIG_MMC)              += mmc/
+obj-$(CONFIG_INFINIBAND)       += infiniband/
 obj-y                          += firmware/
+obj-$(CONFIG_CRYPTO)           += crypto/