From b0d305be529ceb59393872c2aa21f9be8e16d6f4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 14 Mar 2013 15:22:40 -0700 Subject: [PATCH] --- yaml --- r: 363450 b: refs/heads/master c: ad76663264f5237a79fd000c95970360dcac7073 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/Kconfig | 2 -- trunk/drivers/staging/Makefile | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 89efa10d11bf..2c1a205eb702 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44c0186d0c7cf589ba96d7f59246b040dc7408f1 +refs/heads/master: ad76663264f5237a79fd000c95970360dcac7073 diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig index 95f911022b70..d4775a5de65c 100644 --- a/trunk/drivers/staging/Kconfig +++ b/trunk/drivers/staging/Kconfig @@ -116,8 +116,6 @@ source "drivers/staging/android/Kconfig" source "drivers/staging/ozwpan/Kconfig" -source "drivers/staging/ccg/Kconfig" - source "drivers/staging/gdm72xx/Kconfig" source "drivers/staging/csr/Kconfig" diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index 1c486cbcbe2c..e1ed6ad01c8e 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/drivers/staging/Makefile @@ -51,7 +51,6 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ obj-$(CONFIG_MFD_NVEC) += nvec/ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ -obj-$(CONFIG_USB_G_CCG) += ccg/ obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/ obj-$(CONFIG_CSR_WIFI) += csr/ obj-$(CONFIG_OMAP_BANDGAP) += omap-thermal/