diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/media/common/tuners/tuner-i2c.h | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/media/common/tuners/tuner-i2c.h')
| -rw-r--r-- | drivers/media/common/tuners/tuner-i2c.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/common/tuners/tuner-i2c.h b/drivers/media/common/tuners/tuner-i2c.h index 3ad6c8e0b04c..cb1c7141f0c6 100644 --- a/drivers/media/common/tuners/tuner-i2c.h +++ b/drivers/media/common/tuners/tuner-i2c.h | |||
| @@ -170,4 +170,12 @@ __fail: \ | |||
| 170 | __ret; \ | 170 | __ret; \ |
| 171 | }) | 171 | }) |
| 172 | 172 | ||
| 173 | #define hybrid_tuner_report_instance_count(state) \ | ||
| 174 | ({ \ | ||
| 175 | int __ret = 0; \ | ||
| 176 | if (state) \ | ||
| 177 | __ret = state->i2c_props.count; \ | ||
| 178 | __ret; \ | ||
| 179 | }) | ||
| 180 | |||
| 173 | #endif /* __TUNER_I2C_H__ */ | 181 | #endif /* __TUNER_I2C_H__ */ |