diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:15:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:15:31 -0700 |
commit | 4496d937a518fde0d0e1980e4ab470cedb4b50cd (patch) | |
tree | a02d57e13b44483417973a306f9fd23743959375 /drivers/block/Makefile | |
parent | 8e9d2089723d08d51e66c5eea49253d76e27941e (diff) | |
parent | 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: irq_node.handler() should return irqreturn_t
m68k: section mismatch fixes: Atari SCSI
m68k: section mismatch fixes: DMAsound for Atari
MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
m68k: mac - Add SWIM floppy support
m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
m68k: Add install target
Diffstat (limited to 'drivers/block/Makefile')
-rw-r--r-- | drivers/block/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 87e120e0a79..3145141cef7 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -6,6 +6,7 @@ # obj-$(CONFIG_MAC_FLOPPY) += swim3.o +obj-$(CONFIG_BLK_DEV_SWIM) += swim_mod.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o obj-$(CONFIG_PS3_DISK) += ps3disk.o @@ -33,3 +34,5 @@ obj-$(CONFIG_BLK_DEV_UB) += ub.o obj-$(CONFIG_BLK_DEV_HD) += hd.o obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o + +swim_mod-objs := swim.o swim_asm.o |