aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/zsmalloc/Makefile
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-05-12 14:55:30 +0800
committerAlex Shi <alex.shi@linaro.org>2015-05-12 14:55:30 +0800
commit1f8fdf83fe376cc83e96e942689a6cfac01e9634 (patch)
tree5bd0c30cb23791f2806c85631fe45079e6917b9b /drivers/staging/zsmalloc/Makefile
parent8134585f1c33565ea5e752a7ba9323ed3e0921f3 (diff)
parent043787104c5b1386a96c317f2e82ecff257dd9c5 (diff)
downloadlinux-linaro-stable-1f8fdf83fe376cc83e96e942689a6cfac01e9634.tar.gz
Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk
Conflicts: mm/Kconfig mm/Makefile
Diffstat (limited to 'drivers/staging/zsmalloc/Makefile')
-rw-r--r--drivers/staging/zsmalloc/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/zsmalloc/Makefile b/drivers/staging/zsmalloc/Makefile
deleted file mode 100644
index b134848a590d..000000000000
--- a/drivers/staging/zsmalloc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-zsmalloc-y := zsmalloc-main.o
-
-obj-$(CONFIG_ZSMALLOC) += zsmalloc.o