summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-05-28 13:46:26 -0500
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-05-28 13:46:26 -0500
commit2ce8d4213a0fdbfae6aefa5f69bd5787a97844eb (patch)
tree7c306206f7652634289601092ff950431d685972 /drivers/block
parent4fd5bb5d17e440cf34a3b3bb2973f16a76d5eb38 (diff)
parent1c7ddd8848a9f5f947d0d3ebd4be5676739f5cd9 (diff)
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-ok
into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-drivers
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 87d951cc28a1..88eb4e457644 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -8,8 +8,6 @@
# In the future, some of these should be built conditionally.
#
-O_TARGET := block.o
-
export-objs := elevator.o ll_rw_blk.o blkpg.o loop.o DAC960.o genhd.o block_ioctl.o
obj-y := elevator.o ll_rw_blk.o blkpg.o genhd.o block_ioctl.o
@@ -33,6 +31,4 @@ obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o
obj-$(CONFIG_BLK_DEV_UMEM) += umem.o
obj-$(CONFIG_BLK_DEV_NBD) += nbd.o
-subdir-$(CONFIG_PARIDE) += paride
-
include $(TOPDIR)/Rules.make