diff options
| author | Russell King <rmk@armlinux.org.uk> | 2017-02-11 14:21:35 +0000 |
|---|---|---|
| committer | Russell King <rmk@armlinux.org.uk> | 2017-02-11 17:21:05 +0000 |
| commit | 9b9099bc6af81e281eb6603ce93fc5ac48601bb9 (patch) | |
| tree | ccb1c6a42b85b3629e6cd940ecee668b9bb38692 | |
| parent | 2b9479862976d5c891377362f60303189b55fc35 (diff) | |
etnaviv: remove unnecessary <etnaviv/etna.h> includes
Remove the <etnaviv/etna.h> include from etnaviv_accel.h, etnaviv.c,
and etnaviv_dri3.c. Add this header to those files that actually
require this include, or <etnaviv/common.xml.h> for those that just
require definitions from common.xml.h.
Signed-off-by: Russell King <rmk@armlinux.org.uk>
| -rw-r--r-- | etnaviv/etnadrm_emit.c | 2 | ||||
| -rw-r--r-- | etnaviv/etnaviv.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_accel.h | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_dri3.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_dummy.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_emit.c | 2 | ||||
| -rw-r--r-- | etnaviv/etnaviv_render.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_utils.c | 1 | ||||
| -rw-r--r-- | etnaviv/etnaviv_xv.c | 1 |
9 files changed, 7 insertions, 4 deletions
diff --git a/etnaviv/etnadrm_emit.c b/etnaviv/etnadrm_emit.c index c6ebfb9..1780227 100644 --- a/etnaviv/etnadrm_emit.c +++ b/etnaviv/etnadrm_emit.c @@ -9,6 +9,8 @@ #include "etnaviv_op.h" #include "etnadrm.h" +#include <etnaviv/etna.h> + void etnaviv_emit(struct etnaviv *etnaviv) { struct etna_ctx *ctx = etnaviv->ctx; diff --git a/etnaviv/etnaviv.c b/etnaviv/etnaviv.c index 669dc6e..f71f5ff 100644 --- a/etnaviv/etnaviv.c +++ b/etnaviv/etnaviv.c @@ -42,7 +42,6 @@ #include "etnaviv_utils.h" #include "etnaviv_xv.h" -#include <etnaviv/etna.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" diff --git a/etnaviv/etnaviv_accel.h b/etnaviv/etnaviv_accel.h index 425e85b..0355c90 100644 --- a/etnaviv/etnaviv_accel.h +++ b/etnaviv/etnaviv_accel.h @@ -13,7 +13,6 @@ #include "etnaviv_compat_xorg.h" #include <etnaviv/viv.h> -#include <etnaviv/etna.h> #include <etnaviv/etna_bo.h> struct armada_accel_ops; diff --git a/etnaviv/etnaviv_dri3.c b/etnaviv/etnaviv_dri3.c index f4bece4..95e93a9 100644 --- a/etnaviv/etnaviv_dri3.c +++ b/etnaviv/etnaviv_dri3.c @@ -29,7 +29,6 @@ #include "etnaviv_accel.h" #include "etnaviv_dri3.h" -#include <etnaviv/etna.h> #include "etnaviv_compat.h" static Bool etnaviv_dri3_authorise(struct etnaviv *etnaviv, int fd) diff --git a/etnaviv/etnaviv_dummy.c b/etnaviv/etnaviv_dummy.c index 5244148..a4dfa27 100644 --- a/etnaviv/etnaviv_dummy.c +++ b/etnaviv/etnaviv_dummy.c @@ -2,7 +2,6 @@ * libetnaviv "compatibility" with additional etnaviv/drm APIs */ #include <etnaviv/viv.h> -#include <etnaviv/etna.h> #include "etnaviv_compat.h" int etna_bo_flink(struct etna_bo *bo, uint32_t *name) diff --git a/etnaviv/etnaviv_emit.c b/etnaviv/etnaviv_emit.c index dbdbda8..c176ef3 100644 --- a/etnaviv/etnaviv_emit.c +++ b/etnaviv/etnaviv_emit.c @@ -8,6 +8,8 @@ #include "etnaviv_accel.h" #include "etnaviv_op.h" +#include <etnaviv/etna.h> + void etnaviv_emit(struct etnaviv *etnaviv) { struct etna_ctx *ctx = etnaviv->ctx; diff --git a/etnaviv/etnaviv_render.c b/etnaviv/etnaviv_render.c index 699e1d1..33d22d8 100644 --- a/etnaviv/etnaviv_render.c +++ b/etnaviv/etnaviv_render.c @@ -37,6 +37,7 @@ #include "etnaviv_render.h" #include "etnaviv_utils.h" +#include <etnaviv/common.xml.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" diff --git a/etnaviv/etnaviv_utils.c b/etnaviv/etnaviv_utils.c index ea8c7b9..11fcde7 100644 --- a/etnaviv/etnaviv_utils.c +++ b/etnaviv/etnaviv_utils.c @@ -29,6 +29,7 @@ #include "etnaviv_accel.h" #include "etnaviv_utils.h" +#include <etnaviv/common.xml.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" diff --git a/etnaviv/etnaviv_xv.c b/etnaviv/etnaviv_xv.c index f290d64..475a439 100644 --- a/etnaviv/etnaviv_xv.c +++ b/etnaviv/etnaviv_xv.c @@ -37,6 +37,7 @@ #include "etnaviv_utils.h" #include "etnaviv_xv.h" +#include <etnaviv/etna.h> #include <etnaviv/etna_bo.h> #include <etnaviv/state_2d.xml.h> #include "etnaviv_compat.h" |