KVM: Convert KVM from ->nopage() to ->fault()

[safe/jmp/linux-2.6] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 560496b..d92d4d8 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,12 +34,11 @@ 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/
 obj-$(CONFIG_FIREWIRE)         += firewire/
-obj-$(CONFIG_IEEE1394)         += ieee1394/
+obj-y                          += ieee1394/
 obj-$(CONFIG_UIO)              += uio/
 obj-y                          += cdrom/
 obj-y                          += auxdisplay/