diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/block/Makefile | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/block/Makefile')
| -rw-r--r-- | drivers/block/Makefile | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 1cf09a1c065b..3ec1f8df87b1 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile | |||
| @@ -4,21 +4,7 @@ | |||
| 4 | # 12 June 2000, Christoph Hellwig <hch@infradead.org> | 4 | # 12 June 2000, Christoph Hellwig <hch@infradead.org> |
| 5 | # Rewritten to use lists instead of if-statements. | 5 | # Rewritten to use lists instead of if-statements. |
| 6 | # | 6 | # |
| 7 | # Note : at this point, these files are compiled on all systems. | ||
| 8 | # In the future, some of these should be built conditionally. | ||
| 9 | # | ||
| 10 | |||
| 11 | # | ||
| 12 | # NOTE that ll_rw_blk.c must come early in linkage order - it starts the | ||
| 13 | # kblockd threads | ||
| 14 | # | ||
| 15 | |||
| 16 | obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o | ||
| 17 | 7 | ||
| 18 | obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o | ||
| 19 | obj-$(CONFIG_IOSCHED_AS) += as-iosched.o | ||
| 20 | obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o | ||
| 21 | obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o | ||
| 22 | obj-$(CONFIG_MAC_FLOPPY) += swim3.o | 8 | obj-$(CONFIG_MAC_FLOPPY) += swim3.o |
| 23 | obj-$(CONFIG_BLK_DEV_FD) += floppy.o | 9 | obj-$(CONFIG_BLK_DEV_FD) += floppy.o |
| 24 | obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o | 10 | obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o |