# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.633   -> 1.634  
#	    drivers/Makefile	1.19    -> 1.20   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/09	axboe@burns.home.kernel.dk	1.634
# allow 2.4 and 2.5 ide to be built
# --------------------------------------------
#
diff -Nru a/drivers/Makefile b/drivers/Makefile
--- a/drivers/Makefile	Tue Jul  9 12:10:45 2002
+++ b/drivers/Makefile	Tue Jul  9 12:10:45 2002
@@ -11,7 +11,8 @@
 obj-y 				+= base/ char/ block/ misc/ net/ media/
 obj-$(CONFIG_NUBUS)		+= nubus/
 obj-$(CONFIG_ATM)		+= atm/
-obj-$(CONFIG_IDE)		+= ide/
+obj-$(CONFIG_IDE_24)		+= ide24/
+obj-$(CONFIG_IDE_25)		+= ide/
 obj-$(CONFIG_FC4)		+= fc4/
 obj-$(CONFIG_SCSI)		+= scsi/
 obj-$(CONFIG_FUSION)		+= message/