diff --git a/[refs] b/[refs]
index eaaef85bd5c1..ddce89c0a7c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8112248a1b66440f6c562c2669aba6950ef48199
+refs/heads/master: dbf05b279b8ed398a8e92b0c1187882f6df2bf7f
diff --git a/trunk/drivers/staging/cxd2099/cxd2099.h b/trunk/drivers/staging/cxd2099/cxd2099.h
index a313dc26b962..bed54ff3e30b 100644
--- a/trunk/drivers/staging/cxd2099/cxd2099.h
+++ b/trunk/drivers/staging/cxd2099/cxd2099.h
@@ -31,7 +31,7 @@
         (defined(CONFIG_DVB_CXD2099_MODULE) && defined(MODULE))
 struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c);
 #else
-struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c)
+static inline struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c)
 {
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 	return NULL;