Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

[pandora-kernel.git] / include / media / tveeprom.h

diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index 854a2c2..e9fc1a7 100644 (file)
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -1,26 +1,33 @@
 /*
- * $Id: tveeprom.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $
  */
 
 struct tveeprom {
        u32 has_radio;
+       u32 has_ir;     /* 0: no IR, 1: IR present, 2: unknown */
+       u32 has_MAC_address; /* 0: no MAC, 1: MAC present, 2: unknown */
 
        u32 tuner_type;
        u32 tuner_formats;
+       u32 tuner_hauppauge_model;
+
+       u32 tuner2_type;
+       u32 tuner2_formats;
+       u32 tuner2_hauppauge_model;
 
        u32 digitizer;
        u32 digitizer_formats;
 
        u32 audio_processor;
-       /* a_p_fmts? */
+       u32 decoder_processor;
 
        u32 model;
        u32 revision;
        u32 serial_number;
        char rev_str[5];
+       u8 MAC_address[6];
 };
 
-void tveeprom_hauppauge_analog(struct tveeprom *tvee,
+void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                               unsigned char *eeprom_data);
 
 int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len);