kbuild: ftrace: don't assume that scripts/recordmcount.pl is executable

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

diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index 451bd46bd38047acbdb25e9e07f980dfe4b7906b..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 */
@@ -175,14 +173,7 @@ struct tdfx_par {
        u32 palette[16];
        void __iomem *regbase_virt;
        unsigned long iobase;
-
-       struct {
-               int w, u, d;
-               unsigned long enable, disable;
-               struct timer_list timer;
-       } hwcursor;
-
-       spinlock_t DAClock;
+       int mtrr_handle;
 };
 
 #endif /* __KERNEL__ */