Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-dvb.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
index 6ec4bf81fc7f3e0d65c2f3308e0ae93fdff0aa82..b7f5c49b1dbc19f35bc7ce59461d9996cef111a6 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-dvb.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
@@ -20,6 +20,7 @@
 
 #include <linux/kthread.h>
 #include <linux/freezer.h>
+#include <linux/mm.h>
 #include "dvbdev.h"
 #include "pvrusb2-debug.h"
 #include "pvrusb2-hdw-internal.h"
@@ -320,7 +321,7 @@ static int pvr2_dvb_adapter_exit(struct pvr2_dvb_adapter *adap)
 static int pvr2_dvb_frontend_init(struct pvr2_dvb_adapter *adap)
 {
        struct pvr2_hdw *hdw = adap->channel.hdw;
-       struct pvr2_dvb_props *dvb_props = hdw->hdw_desc->dvb_props;
+       const struct pvr2_dvb_props *dvb_props = hdw->hdw_desc->dvb_props;
        int ret = 0;
 
        if (dvb_props == NULL) {