Merge branch 'linus' into core/softlockup

[linux-2.6] / drivers / media / dvb / ttpci / av7110.h

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 115002b0390ca40bbad0c57b52fe457a0ef529a5..e494e04eeee8fb7b8ac2922cbfb8e90d4e0c211c 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -40,12 +40,17 @@
 extern int av7110_debug;
 
 #define dprintk(level,args...) \
-           do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __FUNCTION__); printk(args); } } while (0)
+           do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __func__); printk(args); } } while (0)
 
 #define MAXFILT 32
 
 enum {AV_PES_STREAM, PS_STREAM, TS_STREAM, PES_STREAM};
 
+enum av7110_video_mode {
+       AV7110_VIDEO_MODE_PAL   = 0,
+       AV7110_VIDEO_MODE_NTSC  = 1
+};
+
 struct av7110_p2t {
        u8                pes[TS_SIZE];
        u8                counter;
@@ -170,7 +175,7 @@ struct av7110 {
 
        ca_slot_info_t          ci_slot[2];
 
-       int                     vidmode;
+       enum av7110_video_mode  vidmode;
        struct dmxdev           dmxdev;
        struct dvb_demux        demux;
 
@@ -194,6 +199,7 @@ struct av7110 {
 
        int                     video_blank;
        struct video_status     videostate;
+       u16                     display_panscan;
        int                     display_ar;
        int                     trickmode;
 #define TRICK_NONE   0