vserver 1.9.5.x5

[linux-2.6.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index dfaafd0..04fba9e 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -17,8 +17,9 @@ obj-$(CONFIG_PNP)             += pnp/
 # default.
 obj-y                          += char/
 
-# i810fb depends on char/agp/
+# 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
@@ -36,11 +37,12 @@ obj-$(CONFIG_FUSION)                += message/
 obj-$(CONFIG_IEEE1394)         += ieee1394/
 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/
@@ -58,4 +60,6 @@ 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/