diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:48:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:48:20 -0400 |
| commit | 14dc5249728ff699b1ca4dac01ad416a350a147a (patch) | |
| tree | 4ffd91101601f55c5e0b53a00f03534b7e044ac4 /drivers/block/Makefile | |
| parent | 02b2318e07f98a7cdf7089a4457a8d62424aa824 (diff) | |
| parent | bcd4f3acbaec102e2b8000c977ecc38dcd0fe367 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
splice: direct splicing updates ppos twice
more ACSI removal
umem: Fix match of pci_ids in umem driver
umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
remove the documentation for the legacy CDROM drivers
Diffstat (limited to 'drivers/block/Makefile')
| -rw-r--r-- | drivers/block/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 43371c59623e..7926be8c9fb7 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile | |||
| @@ -9,7 +9,6 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o | |||
| 9 | obj-$(CONFIG_BLK_DEV_FD) += floppy.o | 9 | obj-$(CONFIG_BLK_DEV_FD) += floppy.o |
| 10 | obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o | 10 | obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o |
| 11 | obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o | 11 | obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o |
| 12 | obj-$(CONFIG_ATARI_SLM) += acsi_slm.o | ||
| 13 | obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o | 12 | obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o |
| 14 | obj-$(CONFIG_BLK_DEV_RAM) += rd.o | 13 | obj-$(CONFIG_BLK_DEV_RAM) += rd.o |
| 15 | obj-$(CONFIG_BLK_DEV_LOOP) += loop.o | 14 | obj-$(CONFIG_BLK_DEV_LOOP) += loop.o |