Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / include / video / s1d13xxxfb.h

diff --git a/include/video/s1d13xxxfb.h b/include/video/s1d13xxxfb.h
index c99d261df8f72adbb034fec1970ee5ff2b2c9ded..fe41b84079460033618a0598fa424aefc6c55576 100644 (file)
--- a/include/video/s1d13xxxfb.h
+++ b/include/video/s1d13xxxfb.h
@@ -14,7 +14,8 @@
 #define        S1D13XXXFB_H
 
 #define S1D_PALETTE_SIZE               256
-#define S1D_CHIP_REV                   7       /* expected chip revision number for s1d13806 */
+#define S1D13506_CHIP_REV              4       /* expected chip revision number for s1d13506 */
+#define S1D13806_CHIP_REV              7       /* expected chip revision number for s1d13806 */
 #define S1D_FBID                       "S1D13806"
 #define S1D_DEVICENAME                 "s1d13806fb"