fedora core 2.6.10-1.12-FC2

[linux-2.6.git] / drivers / video / aty / radeonfb.h

diff --git a/drivers/video/aty/radeonfb.h b/drivers/video/aty/radeonfb.h
index a316e82..7377cb7 100644 (file)
--- a/drivers/video/aty/radeonfb.h
+++ b/drivers/video/aty/radeonfb.h
@@ -223,8 +223,6 @@ struct radeon_regs {
 
                /* Palette */
        int             palette_valid;
-       u32             palette[256];
-       u32             palette2[256];
 };
 
 struct panel_info {
@@ -264,14 +262,14 @@ struct radeonfb_info {
        unsigned long           mmio_base_phys;
        unsigned long           fb_base_phys;
 
-       unsigned long           mmio_base;
-       unsigned long           fb_base;
+       void __iomem            *mmio_base;
+       void __iomem            *fb_base;
 
-       unsigned long           fb_local_base;
+       unsigned long           fb_local_base;
 
        struct pci_dev          *pdev;
 
-       u8                      *bios_seg;
+       void __iomem            *bios_seg;
        int                     fp_bios_start;
 
        u32                     pseudo_palette[17];
@@ -427,8 +425,6 @@ static inline u32 _INPLL(struct radeonfb_info *rinfo, u32 addr)
                spin_unlock_irqrestore(&rinfo->reg_lock, flags);        \
        } while (0)
 
-#define MS_TO_HZ(ms)       ((ms * HZ + 999) / 1000)
-
 #define BIOS_IN8(v)    (readb(rinfo->bios_seg + (v)))
 #define BIOS_IN16(v)   (readb(rinfo->bios_seg + (v)) | \
                          (readb(rinfo->bios_seg + (v) + 1) << 8))
@@ -440,15 +436,6 @@ static inline u32 _INPLL(struct radeonfb_info *rinfo, u32 addr)
 /*
  * Inline utilities
  */
-
-static inline void wait_ms(unsigned long ms)
-{
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout((ms * HZ + 999) / 1000);
-}
-
-
-
 static inline int round_div(int num, int den)
 {
         return (num + (den / 2)) / den;
@@ -527,12 +514,6 @@ static inline void _radeon_engine_idle (struct radeonfb_info *rinfo)
        printk(KERN_ERR "radeonfb: Idle Timeout !\n");
 }
 
-static inline int radeon_accel_disabled(void)
-{
-       extern int radeonfb_noaccel;
-       return radeonfb_noaccel;
-}
-
 #define radeon_engine_idle()           _radeon_engine_idle(rinfo)
 #define radeon_fifo_wait(entries)      _radeon_fifo_wait(rinfo,entries)