summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-06-25 09:01:19 -0400
committerRob Clark <robdclark@gmail.com>2014-08-04 11:55:28 -0400
commit89301471e6bf942c026d6ebfcbc9a6a937cc6865 (patch)
treee15e5bef06eedb61e84cdf5e718a2a87f90fe6e6 /drivers/gpu/drm/msm/adreno/a3xx_gpu.h
parent41e69778c80764c12683beff5ebef12298a5d16b (diff)
drm/msm: update generated headers
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/a3xx_gpu.h')
-rw-r--r--drivers/gpu/drm/msm/adreno/a3xx_gpu.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
index bb9a8ca0507b..85ff66cbddd6 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
@@ -19,6 +19,11 @@
#define __A3XX_GPU_H__
#include "adreno_gpu.h"
+
+/* arrg, somehow fb.h is getting pulled in: */
+#undef ROP_COPY
+#undef ROP_XOR
+
#include "a3xx.xml.h"
struct a3xx_gpu {