Commit 85854e07 authored by Paul Geary's avatar Paul Geary

Merge remote-tracking branch 'freedesktop/master' into HEAD

parents 6ad6ca8e 459fcb44
......@@ -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"
......
......@@ -21,6 +21,11 @@
* SOFTWARE.
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <sys/mman.h>
#include <assert.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment