diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-09 17:18:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-09 17:18:19 +1100 |
| commit | 78c790214833d185ff24314f49f448d3896a78d0 (patch) | |
| tree | 0e2cdbe8d05a2224037964d1ff37db224e4ce100 /drivers/block/Makefile | |
| parent | 8c1f750c9b18c3ce3c762f73cf50752222a961c4 (diff) | |
| parent | 7178e2055358c9754ce605e28af83f75e3971bbc (diff) | |
Merge branch 'akpm/master'
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 816d979c3266..02b688d1438d 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/ obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk.o +obj-$(CONFIG_ZRAM) += zram/ nvme-y := nvme-core.o nvme-scsi.o skd-y := skd_main.o |