git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
video
/
pxafb.h
diff --git
a/drivers/video/pxafb.h
b/drivers/video/pxafb.h
index
de15fec
..
7499a1c
100644
(file)
--- a/
drivers/video/pxafb.h
+++ b/
drivers/video/pxafb.h
@@
-41,10
+41,6
@@
struct pxafb_info {
struct fb_info fb;
struct device *dev;
struct fb_info fb;
struct device *dev;
- u_int max_bpp;
- u_int max_xres;
- u_int max_yres;
-
/*
* These are the addresses we mapped
* the framebuffer memory region to.
/*
* These are the addresses we mapped
* the framebuffer memory region to.
@@
-83,6
+79,8
@@
struct pxafb_info {
u_int reg_lccr2;
u_int reg_lccr3;
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;
volatile u_char state;
volatile u_char task_state;
struct semaphore ctrlr_sem;
@@
-111,15
+109,6
@@
struct pxafb_info {
#define PXA_NAME "PXA"
#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
*/
/*
* Minimum X and Y resolutions
*/