diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/i2c-id.h | 1 | ||||
-rw-r--r-- | include/media/tveeprom.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 1543daaa9c5e..ef3b5632e63a 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
@@ -108,6 +108,7 @@ | |||
108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ | 108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ |
109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ | 109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ |
110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ | 110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ |
111 | #define I2C_DRIVERID_I2C_IR 75 /* I2C InfraRed on Video boards */ | ||
111 | 112 | ||
112 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ | 113 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ |
113 | #define I2C_DRIVERID_EXP1 0xF1 | 114 | #define I2C_DRIVERID_EXP1 0xF1 |
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h index e2035c7da094..e9fc1a785497 100644 --- a/include/media/tveeprom.h +++ b/include/media/tveeprom.h | |||
@@ -4,12 +4,15 @@ | |||
4 | struct tveeprom { | 4 | struct tveeprom { |
5 | u32 has_radio; | 5 | u32 has_radio; |
6 | u32 has_ir; /* 0: no IR, 1: IR present, 2: unknown */ | 6 | u32 has_ir; /* 0: no IR, 1: IR present, 2: unknown */ |
7 | u32 has_MAC_address; /* 0: no MAC, 1: MAC present, 2: unknown */ | ||
7 | 8 | ||
8 | u32 tuner_type; | 9 | u32 tuner_type; |
9 | u32 tuner_formats; | 10 | u32 tuner_formats; |
11 | u32 tuner_hauppauge_model; | ||
10 | 12 | ||
11 | u32 tuner2_type; | 13 | u32 tuner2_type; |
12 | u32 tuner2_formats; | 14 | u32 tuner2_formats; |
15 | u32 tuner2_hauppauge_model; | ||
13 | 16 | ||
14 | u32 digitizer; | 17 | u32 digitizer; |
15 | u32 digitizer_formats; | 18 | u32 digitizer_formats; |
@@ -21,6 +24,7 @@ struct tveeprom { | |||
21 | u32 revision; | 24 | u32 revision; |
22 | u32 serial_number; | 25 | u32 serial_number; |
23 | char rev_str[5]; | 26 | char rev_str[5]; |
27 | u8 MAC_address[6]; | ||
24 | }; | 28 | }; |
25 | 29 | ||
26 | void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, | 30 | void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, |