Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / drivers / video / pxafb.h

diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h
index f8605b807b0acbf5c018cc5ce407cc85b3f014ce..d920b8a14c35970c8f261ae41c2fc440cb815e38 100644 (file)
--- a/drivers/video/pxafb.h
+++ b/drivers/video/pxafb.h
@@ -71,6 +71,7 @@ struct pxafb_info {
 
        u_int                   lccr0;
        u_int                   lccr3;
+       u_int                   lccr4;
        u_int                   cmap_inverse:1,
                                cmap_static:1,
                                unused:30;
@@ -79,6 +80,7 @@ struct pxafb_info {
        u_int                   reg_lccr1;
        u_int                   reg_lccr2;
        u_int                   reg_lccr3;
+       u_int                   reg_lccr4;
 
        unsigned long   hsync_time;