Merge commit 'v2.6.28-rc7' into core/locking

[mv-sheeva.git] / include / video / tdfx.h

diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index e6ab66fc7fc8b6b0a154d93526881ac37f2148b7..7431d9681e57280b740db748257d168077eb3e1a 100644 (file)
--- a/include/video/tdfx.h
+++ b/include/video/tdfx.h
@@ -79,8 +79,6 @@
 
 /* register bitfields (not all, only as needed) */
 
-#define BIT(x) (1UL << (x))
-
 /* COMMAND_2D reg. values */
 #define TDFX_ROP_COPY          0xcc    /* src */
 #define TDFX_ROP_INVERT                0x55    /* NOT dst */
@@ -167,8 +165,6 @@ struct banshee_reg {
        unsigned long clip0max;
        unsigned long clip1min;
        unsigned long clip1max;
-       unsigned long srcbase;
-       unsigned long dstbase;
        unsigned long miscinit0;
 };
 
@@ -177,15 +173,7 @@ struct tdfx_par {
        u32 palette[16];
        void __iomem *regbase_virt;
        unsigned long iobase;
-       u32 baseline;
-
-       struct {
-               int w, u, d;
-               unsigned long enable, disable;
-               struct timer_list timer;
-       } hwcursor;
-
-       spinlock_t DAClock;
+       int mtrr_handle;
 };
 
 #endif /* __KERNEL__ */