Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / linux / i2c-vid.h

diff --git a/include/linux/i2c-vid.h b/include/linux/i2c-vid.h
index 974835e3530f44a845a7811ff0294ad2273143bd..41d0635e0ba94380a3311de7640833cfee57020a 100644 (file)
--- a/include/linux/i2c-vid.h
+++ b/include/linux/i2c-vid.h
@@ -97,3 +97,15 @@ static inline int vid_from_reg(int val, int vrm)
                                     2050 - (val) * 50);
        }
 }
+
+static inline int vid_to_reg(int val, int vrm)
+{
+       switch (vrm) {
+       case 91:                /* VRM 9.1 */
+       case 90:                /* VRM 9.0 */
+               return ((val >= 1100) && (val <= 1850) ?
+                       ((18499 - val * 10) / 25 + 5) / 10 : -1);
+       default:
+               return -1;
+       }
+}