summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Jennings <sjenning@linux.vnet.ibm.com>2012-01-09 22:51:57 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-09 01:12:54 (GMT)
commit94add674a78c379fe352eacb5137ed77ccb0a979 (patch)
treeb3d065c0a594d497452effcaedfc654b0ad2563e
parent61989a80fb3ac9d7837d03053624d5ea034a0d02 (diff)
downloadlinux-fsl-qoriq-94add674a78c379fe352eacb5137ed77ccb0a979.tar.xz
staging: add zsmalloc to Kconfig/Makefile
Adds the new zsmalloc library to the staging Kconfig and Makefile Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 76a4c4a..783bc0a 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -90,6 +90,8 @@ source "drivers/staging/zram/Kconfig"
source "drivers/staging/zcache/Kconfig"
+source "drivers/staging/zsmalloc/Kconfig"
+
source "drivers/staging/wlags49_h2/Kconfig"
source "drivers/staging/wlags49_h25/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index c061be8..4fa1e5e 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -37,6 +37,7 @@ obj-$(CONFIG_IIO) += iio/
obj-$(CONFIG_ZRAM) += zram/
obj-$(CONFIG_XVMALLOC) += zram/
obj-$(CONFIG_ZCACHE) += zcache/
+obj-$(CONFIG_ZSMALLOC) += zsmalloc/
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
obj-$(CONFIG_FB_SM7XX) += sm7xx/