Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

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

diff --git a/include/linux/xilinxfb.h b/include/linux/xilinxfb.h
index 9ad984d22c38e88e87a803b7a2434ccd5187f5ca..f2463f559fb9e7ad60b051485ee420a89916592f 100644 (file)
--- a/include/linux/xilinxfb.h
+++ b/include/linux/xilinxfb.h
@@ -15,9 +15,16 @@
 
 /* ML300/403 reference design framebuffer driver platform data struct */
 struct xilinxfb_platform_data {
-       u32 rotate_screen;
-       u32 screen_height_mm;
+       u32 rotate_screen;      /* Flag to rotate display 180 degrees */
+       u32 screen_height_mm;   /* Physical dimentions of screen in mm */
        u32 screen_width_mm;
+       u32 xres, yres;         /* resolution of screen in pixels */
+       u32 xvirt, yvirt;       /* resolution of memory buffer */
+
+       /* Physical address of framebuffer memory; If non-zero, driver
+        * will use provided memory address instead of allocating one from
+        * the consistent pool. */
+       u32 fb_phys;
 };
 
 #endif  /* __XILINXFB_H__ */