Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-beck.git] / include / video / tdfx.h

diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index befbaf0a92d83c84ec980c56bc1fce45d4f1c0f3..69674b94bb684b2271a599fe4d29e273d0084f4f 100644 (file)
--- a/include/video/tdfx.h
+++ b/include/video/tdfx.h
@@ -196,7 +196,7 @@ struct tdfx_par {
        u32 palette[16];
        void __iomem *regbase_virt;
        unsigned long iobase;
-       int mtrr_handle;
+       int wc_cookie;
 #ifdef CONFIG_FB_3DFX_I2C
        struct tdfxfb_i2c_chan chan[2];
 #endif