# HG changeset patch
# User diego
# Date 1214210870 0
# Node ID 0b4d8e4d4ed757d350b6baca7e88eeb4acce57c7
# Parent  66e9988957077e555aaa8d774aa01ff0b630b1cc
Rename some definitions to avoid clashing with system headers, fixes:
./drivers/3dfx.h:262:1: warning: "ROP_COPY" redefined
/usr/include/linux/fb.h:311:1: warning: this is the location of the previous definition
./drivers/3dfx.h:264:1: warning: "ROP_XOR" redefined
/usr/include/linux/fb.h:312:1: warning: this is the location of the previous definition

diff -r 66e998895707 -r 0b4d8e4d4ed7 drivers/3dfx.h
--- a/drivers/3dfx.h	Sun Jun 22 19:25:54 2008 +0000
+++ b/drivers/3dfx.h	Mon Jun 23 08:47:50 2008 +0000
@@ -259,10 +259,10 @@
 #define BIT(x) (1UL << (x))
 
 /* COMMAND_2D reg. values */
-#define ROP_COPY		0xcc     // src
-#define ROP_INVERT      0x55     // NOT dst
-#define ROP_XOR         0x66     // src XOR dst
-#define ROP_OR			(0xee)	/* src | dst */
+#define TDFXFB_ROP_COPY         0xcc     // src
+#define TDFXFB_ROP_INVERT       0x55     // NOT dst
+#define TDFXFB_ROP_XOR          0x66     // src XOR dst
+#define TDFXFB_ROP_OR           0xee     // src | dst
 
 #define AUTOINC_DSTX                    BIT(10)
 #define AUTOINC_DSTY                    BIT(11)