diff options
| author | Paul Geary <paul.geary@arm.com> | 2015-02-02 11:42:23 +0000 |
|---|---|---|
| committer | Paul Geary <paul.geary@arm.com> | 2015-02-02 11:42:23 +0000 |
| commit | 85854e077dee26a67b1e84c236079b72439237ce (patch) | |
| tree | ef9d145450af4644e5850dad80cca9eea222e416 | |
| parent | 6ad6ca8eea1b041ff63fa7d68f9ed2f0ae29e139 (diff) | |
| parent | 459fcb44e1782facfc7954a7e276e1492a3f312b (diff) | |
Merge remote-tracking branch 'freedesktop/master' into HEAD1.2.0
| -rw-r--r-- | src/armsoc_driver.c | 8 | ||||
| -rw-r--r-- | src/armsoc_dumb.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/armsoc_driver.c b/src/armsoc_driver.c index 578a563..cbb982b 100644 --- a/src/armsoc_driver.c +++ b/src/armsoc_driver.c @@ -27,6 +27,10 @@ * Rob Clark <rob@ti.com> */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -37,10 +41,6 @@ #include <pixman.h> -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "armsoc_driver.h" #include "micmap.h" diff --git a/src/armsoc_dumb.c b/src/armsoc_dumb.c index 879d77c..7e6dbd9 100644 --- a/src/armsoc_dumb.c +++ b/src/armsoc_dumb.c @@ -21,6 +21,11 @@ * SOFTWARE. * */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <sys/mman.h> #include <assert.h> |