This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index dfaafd0..d75e518 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
@@ -29,6 +30,7 @@ obj-y                         += base/ block/ misc/ net/ media/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_PPC_PMAC)         += macintosh/
+obj-$(CONFIG_ARCH_XEN)         += xen/
 obj-$(CONFIG_IDE)              += ide/
 obj-$(CONFIG_FC4)              += fc4/
 obj-$(CONFIG_SCSI)             += scsi/
@@ -36,17 +38,18 @@ 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/
 obj-$(CONFIG_USB_GADGET)       += usb/gadget/
-obj-$(CONFIG_INPUT)            += input/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
+obj-$(CONFIG_INPUT)            += input/
 obj-$(CONFIG_I2O)              += message/
 obj-$(CONFIG_I2C)              += i2c/
 obj-$(CONFIG_W1)               += w1/
@@ -57,5 +60,9 @@ obj-$(CONFIG_ISDN)            += isdn/
 obj-$(CONFIG_MCA)              += mca/
 obj-$(CONFIG_EISA)             += eisa/
 obj-$(CONFIG_CPU_FREQ)         += cpufreq/
+obj-$(CONFIG_CRASH_DUMP)       += dump/
 obj-$(CONFIG_MMC)              += mmc/
+obj-$(CONFIG_INFINIBAND)       += infiniband/
+obj-$(CONFIG_BLK_DEV_SGIIOC4)  += sn/
 obj-y                          += firmware/
+obj-$(CONFIG_CRYPTO)           += crypto/