diff --git a/[refs] b/[refs]
index c7d2b1087bc0..59960a419557 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d651b886e49cfaa0b3ff634a2c9388ae4ce7d65c
+refs/heads/master: 112a35edd6a6fc0ef91c2a57ca679d5eaaa18ab5
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index eb6145521bc0..0b47a06c104a 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/drivers/staging/Kconfig
@@ -138,4 +138,6 @@ source "drivers/staging/sb105x/Kconfig"
 
 source "drivers/staging/fwserial/Kconfig"
 
+source "drivers/staging/zcache/Kconfig"
+
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 18420b84ffd8..b026ea37bcaf 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -61,3 +61,4 @@ obj-$(CONFIG_DRM_IMX)		+= imx-drm/
 obj-$(CONFIG_DGRP)		+= dgrp/
 obj-$(CONFIG_SB105X)		+= sb105x/
 obj-$(CONFIG_FIREWIRE_SERIAL)	+= fwserial/
+obj-$(CONFIG_ZCACHE)		+= zcache/