X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fvideo%2Fpxafb.h;h=d920b8a14c35970c8f261ae41c2fc440cb815e38;hb=8fc543c8f004fc9dfe0a262dc452dfe2eca4589b;hp=22c00be786a8e28e12327051ae6473bb81eb4c47;hpb=32983696a48a6c41d99f3eca82ba7510a552d843;p=~andy%2Flinux

diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h
index 22c00be786a..d920b8a14c3 100644
--- a/drivers/video/pxafb.h
+++ b/drivers/video/pxafb.h
@@ -40,10 +40,7 @@ struct pxafb_dma_descriptor {
 struct pxafb_info {
 	struct fb_info		fb;
 	struct device		*dev;
-
-	u_int			max_bpp;
-	u_int			max_xres;
-	u_int			max_yres;
+	struct clk		*clk;
 
 	/*
 	 * These are the addresses we mapped
@@ -74,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;
@@ -82,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;
 
@@ -113,15 +112,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
  */