diff --git a/[refs] b/[refs]
index 8ccc9e324a0f..fd24deffd95a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a34ff6cdbb464b3e37f0cbb6b0cff9dab4ee057b
+refs/heads/master: fcc8e7d8c0e228cf032de0df049a91d5d2bfd0e9
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_net.h b/trunk/drivers/media/dvb/dvb-core/dvb_net.h
index cfd2c46bd5d9..1e53acd50cf4 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvb_net.h
+++ b/trunk/drivers/media/dvb/dvb-core/dvb_net.h
@@ -42,32 +42,25 @@ struct dvb_net {
 	struct dmx_demux *demux;
 };
 
-
 void dvb_net_release(struct dvb_net *);
 int  dvb_net_init(struct dvb_adapter *, struct dvb_net *, struct dmx_demux *);
 
-#endif
-
-#ifndef CONFIG_DVB_NET
-
-struct dvb_dev_stub;
+#else
 
 struct dvb_net {
-	struct dvb_dev_stub *dvbdev;
+	struct dvb_device *dvbdev;
 };
 
 static inline void dvb_net_release(struct dvb_net *dvbnet)
 {
-	dvbnet->dvbdev = 0;
 }
 
 static inline int dvb_net_init(struct dvb_adapter *adap,
 			       struct dvb_net *dvbnet, struct dmx_demux *dmx)
 {
-	dvbnet->dvbdev = (void *)1;
 	return 0;
 }
 
-#endif
+#endif /* ifdef CONFIG_DVB_NET */
 
 #endif