diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:55:30 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-05-12 14:55:30 +0800 |
| commit | 1f8fdf83fe376cc83e96e942689a6cfac01e9634 (patch) | |
| tree | 5bd0c30cb23791f2806c85631fe45079e6917b9b /drivers/staging/zram/Makefile | |
| parent | 8134585f1c33565ea5e752a7ba9323ed3e0921f3 (diff) | |
| parent | 043787104c5b1386a96c317f2e82ecff257dd9c5 (diff) | |
Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk
Conflicts:
mm/Kconfig
mm/Makefile
Diffstat (limited to 'drivers/staging/zram/Makefile')
| -rw-r--r-- | drivers/staging/zram/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/zram/Makefile b/drivers/staging/zram/Makefile deleted file mode 100644 index 7f4a3019e9c4..000000000000 --- a/drivers/staging/zram/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -zram-y := zram_drv.o zram_sysfs.o - -obj-$(CONFIG_ZRAM) += zram.o |