Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index fb6425d3ed35f06efceffa76438970a52d6fae38..94b44427e80e498e41358ecc242c8c8963a8a724 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_NUBUS)           += nubus/
 obj-$(CONFIG_ATM)              += atm/
 obj-y                          += macintosh/
 obj-$(CONFIG_IDE)              += ide/
-obj-$(CONFIG_FC4)              += fc4/
 obj-$(CONFIG_SCSI)             += scsi/
 obj-$(CONFIG_ATA)              += ata/
 obj-$(CONFIG_FUSION)           += message/