diff --git a/[refs] b/[refs] index 9e099b175f78..9f95186d1268 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d4df4ef4ad1a0489a9c22e32d55a5060a4830a1 +refs/heads/master: df50567797be6d883364162176fd5e8a76ee751b diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index fa41b9c23783..c02689c0422c 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/drivers/staging/Makefile @@ -41,7 +41,6 @@ obj-$(CONFIG_HYPERV) += hv/ obj-$(CONFIG_VME_BUS) += vme/ obj-$(CONFIG_DX_SEP) += sep/ obj-$(CONFIG_IIO) += iio/ -obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio/ obj-$(CONFIG_ZRAM) += zram/ obj-$(CONFIG_XVMALLOC) += zram/ obj-$(CONFIG_ZCACHE) += zcache/