Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.h b/drivers/media/video/pvrusb2/pvrusb2-dvb.h
index 1326f6f455a6b4ff59f6db589aa124f15e8f98f6..884ff916a352cce11c0e7e48e9afdb1f1fbb942b 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-dvb.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-dvb.h
@@ -25,7 +25,6 @@ struct pvr2_dvb_adapter {
        struct task_struct      *thread;
        struct mutex            lock;
 
-       unsigned int            digital_up:1;
        unsigned int            stream_run:1;
 
        wait_queue_head_t       buffer_wait_data;
@@ -37,6 +36,6 @@ struct pvr2_dvb_props {
        int (*tuner_attach) (struct pvr2_dvb_adapter *);
 };
 
-int pvr2_dvb_init(struct pvr2_context *pvr);
+struct pvr2_dvb_adapter *pvr2_dvb_create(struct pvr2_context *pvr);
 
 #endif /* __PVRUSB2_DVB_H__ */