Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / video / kyro.h

diff --git a/include/video/kyro.h b/include/video/kyro.h
index c5f9b0f..dba7de2 100644 (file)
--- a/include/video/kyro.h
+++ b/include/video/kyro.h
@@ -13,8 +13,9 @@
 #define _KYRO_H
 
 struct kyrofb_info {
-       void *regbase;
+       void __iomem *regbase;
 
+       u32 palette[16];
        u32 HTot;       /* Hor Total Time    */
        u32 HFP;        /* Hor Front Porch   */
        u32 HST;        /* Hor Sync Time     */
@@ -49,9 +50,7 @@ extern void *kyro_dev_virtual_regs_ptr(void);
 extern unsigned int kyro_dev_fb_size(void);
 extern unsigned int kyro_dev_regs_size(void);
 
-extern int kyro_dev_overlay_create(u32 width, u32 height, int bLinear);
 extern u32 kyro_dev_overlay_offset(void);
-extern int kyro_dev_overlay_viewport_set(u32 x, u32 y, u32 width, u32 height);
 
 /*
  * benedict.gaster@superh.com