From 6222d7a17745f6e48fddda7245e4bb0d58bfeaf0 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 30 Jan 2012 14:54:48 -0800 Subject: telephony: Move to staging This stuff is really old and in quite poor shape. Does anyone still use it? If not, I think it's appropriate to let it simmer in staging for a few releases. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Kconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/staging/Kconfig') diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 21e2f4b87f1..aaba36c6f15 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -132,4 +132,6 @@ source "drivers/staging/omapdrm/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/telephony/Kconfig" + endif # STAGING -- cgit v1.2.3 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/Kconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/staging/Kconfig') diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index aaba36c6f15..76a4c4a4717 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -134,4 +134,6 @@ source "drivers/staging/android/Kconfig" source "drivers/staging/telephony/Kconfig" +source "drivers/staging/ramster/Kconfig" + endif # STAGING -- cgit v1.2.3 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/Kconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/staging/Kconfig') diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 76a4c4a4717..783bc0a9121 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" -- cgit v1.2.3 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/Kconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/staging/Kconfig') diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 783bc0a9121..f916a3f7444 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -136,6 +136,4 @@ source "drivers/staging/android/Kconfig" source "drivers/staging/telephony/Kconfig" -source "drivers/staging/ramster/Kconfig" - endif # STAGING -- cgit v1.2.3