diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:05:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:05:40 -0700 |
| commit | d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8 (patch) | |
| tree | 3176a15279e2521d2391c7b2cec6f7b923faa64b /drivers/block/Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| parent | powerpc/ps3: ps3_defconfig updates (diff) | |
| download | linux-dev-d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8.tar.xz linux-dev-d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/ps3: ps3_defconfig updates
powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW
powerpc/5200: Enable CPU_FTR_NEED_COHERENT for MPC52xx
ps3/block: Replace mtd/ps3vram by block/ps3vram
Diffstat (limited to 'drivers/block/Makefile')
| -rw-r--r-- | drivers/block/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 204332b29578..87e120e0a79c 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_MAC_FLOPPY) += swim3.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o obj-$(CONFIG_AMIGA_FLOPPY) += amiflop.o obj-$(CONFIG_PS3_DISK) += ps3disk.o +obj-$(CONFIG_PS3_VRAM) += ps3vram.o obj-$(CONFIG_ATARI_FLOPPY) += ataflop.o obj-$(CONFIG_AMIGA_Z2RAM) += z2ram.o obj-$(CONFIG_BLK_DEV_RAM) += brd.o |