| commit | 89301471e6bf942c026d6ebfcbc9a6a937cc6865 | [log] [tgz] |
|---|---|---|
| author | Rob Clark <robdclark@gmail.com> | Wed Jun 25 09:01:19 2014 -0400 |
| committer | Rob Clark <robdclark@gmail.com> | Mon Aug 04 11:55:28 2014 -0400 |
| tree | e15e5bef06eedb61e84cdf5e718a2a87f90fe6e6 | |
| parent | 41e69778c80764c12683beff5ebef12298a5d16b [diff] [blame] |
drm/msm: update generated headers Signed-off-by: Rob Clark <robdclark@gmail.com>
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h index bb9a8ca..85ff66c 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 {