From 1739441c29e09706a1f82e6e0fecfd946b6f4328 Mon Sep 17 00:00:00 2001 From: Dan Magenheimer Date: Mon, 30 Jan 2012 14:39:19 -0800 Subject: staging: ramster: enable as staging driver Enable build of ramster as a staging driver Signed-off-by: Dan Magenheimer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/staging/Makefile') diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 7c5808d..c061be8 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -57,3 +57,4 @@ obj-$(CONFIG_INTEL_MEI) += mei/ obj-$(CONFIG_MFD_NVEC) += nvec/ obj-$(CONFIG_DRM_OMAP) += omapdrm/ obj-$(CONFIG_ANDROID) += android/ +obj-$(CONFIG_RAMSTER) += ramster/ -- cgit v1.1 From 94add674a78c379fe352eacb5137ed77ccb0a979 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Mon, 9 Jan 2012 16:51:57 -0600 Subject: staging: add zsmalloc to Kconfig/Makefile Adds the new zsmalloc library to the staging Kconfig and Makefile Signed-off-by: Seth Jennings Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/staging/Makefile') 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/ -- cgit v1.1 From b154ff05e1b0d749231a71896c90e38657f8e675 Mon Sep 17 00:00:00 2001 From: Nitin Gupta Date: Mon, 9 Jan 2012 16:52:00 -0600 Subject: staging: zram: remove xvmalloc Removes the xvmalloc allocator code from the zram driver Signed-off-by: Nitin Gupta Acked-by: Seth Jennings Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/staging/Makefile') diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 4fa1e5e..31c81fa 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -35,7 +35,6 @@ obj-$(CONFIG_VME_BUS) += vme/ obj-$(CONFIG_DX_SEP) += sep/ 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/ -- cgit v1.1 From d8e4cd99d5a13f65fb961e627b63ae70ab0fe951 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 9 Feb 2012 14:56:25 +0200 Subject: staging: fix the build breakage cuased by telephony drivers Fix build error caused by commit: 6222d7a17745f6e48fddda7245e4bb0d58bfeaf0 telephony: Move to staging The telephony driver was moved to staging but the Makefiles weren't updated Cc: Joe Perches Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/staging/Makefile') diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 31c81fa..077a3f3 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -58,3 +58,4 @@ obj-$(CONFIG_MFD_NVEC) += nvec/ obj-$(CONFIG_DRM_OMAP) += omapdrm/ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_RAMSTER) += ramster/ +obj-$(CONFIG_PHONE) += telephony/ -- cgit v1.1 From c123daaad835681d4acffd7631e448fd2c77677f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 10 Feb 2012 09:45:22 -0800 Subject: staging: ramster: delete the driver Turns out it's not quite ready to be included, thanks to some other work done in the zcache and zram code, which breaks this driver. So, delete it for now, per the recommendation of Dan. Acked-by: Dan Magenheimer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/staging/Makefile') diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 077a3f3..f6d4a43 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -57,5 +57,4 @@ obj-$(CONFIG_INTEL_MEI) += mei/ obj-$(CONFIG_MFD_NVEC) += nvec/ obj-$(CONFIG_DRM_OMAP) += omapdrm/ obj-$(CONFIG_ANDROID) += android/ -obj-$(CONFIG_RAMSTER) += ramster/ obj-$(CONFIG_PHONE) += telephony/ -- cgit v1.1