diff --git a/[refs] b/[refs]
index 7364be47e569..ce93a2fa496a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d044189dfea1e8329d63cb4e18815a7e92d2e049
+refs/heads/master: 6c9eaa82da53676db830572f5a41aa9ffea133a1
diff --git a/trunk/drivers/media/video/tlg2300/pd-dvb.c b/trunk/drivers/media/video/tlg2300/pd-dvb.c
index ebd9cb5bec74..edd78f8b1baa 100644
--- a/trunk/drivers/media/video/tlg2300/pd-dvb.c
+++ b/trunk/drivers/media/video/tlg2300/pd-dvb.c
@@ -97,15 +97,17 @@ static int poseidon_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
 	return ret;
 }
 
+#ifdef CONFIG_PM
 static void poseidon_fe_release(struct dvb_frontend *fe)
 {
 	struct poseidon *pd = fe->demodulator_priv;
 
-#ifdef CONFIG_PM
 	pd->pm_suspend = NULL;
 	pd->pm_resume  = NULL;
-#endif
 }
+#else
+#define poseidon_fe_release NULL
+#endif
 
 static s32 poseidon_fe_sleep(struct dvb_frontend *fe)
 {
diff --git a/trunk/drivers/media/video/tlg2300/pd-video.c b/trunk/drivers/media/video/tlg2300/pd-video.c
index cf8f18c007e6..ed5cb1818adc 100644
--- a/trunk/drivers/media/video/tlg2300/pd-video.c
+++ b/trunk/drivers/media/video/tlg2300/pd-video.c
@@ -12,8 +12,10 @@
 #include "pd-common.h"
 #include "vendorcmds.h"
 
+#ifdef CONFIG_PM
 static int pm_video_suspend(struct poseidon *pd);
 static int pm_video_resume(struct poseidon *pd);
+#endif
 static void iso_bubble_handler(struct work_struct *w);
 
 int usb_transfer_mode;