intelfb: add hw cursor support for i9xx

[safe/jmp/linux-2.6] / drivers / video / pxafb.h

diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h
index de15fec..47f41f7 100644 (file)
--- a/drivers/video/pxafb.h
+++ b/drivers/video/pxafb.h
@@ -83,6 +83,8 @@ struct pxafb_info {
        u_int                   reg_lccr2;
        u_int                   reg_lccr3;
 
+       unsigned long   hsync_time;
+
        volatile u_char         state;
        volatile u_char         task_state;
        struct semaphore        ctrlr_sem;
@@ -112,15 +114,6 @@ struct pxafb_info {
 #define PXA_NAME       "PXA"
 
 /*
- *  Debug macros
- */
-#if DEBUG
-#  define DPRINTK(fmt, args...)        printk("%s: " fmt, __FUNCTION__ , ## args)
-#else
-#  define DPRINTK(fmt, args...)
-#endif
-
-/*
  * Minimum X and Y resolutions
  */
 #define MIN_XRES       64