Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3e8ea50 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-next-fixes-2015-08-30' of... 

Merge tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo/linux into drm-next

Just one small fix before 4.3 merge window:

- Use linux/mman.h instead of uapi's mman-common.h inside the driver.

* tag 'drm-amdkfd-next-fixes-2015-08-30' of git://people.freedesktop.org/~gabbayo/linux:
  amdkfd: use <linux/mman.h> instead of <uapi/asm-generic/mman-common.h>
parents 92cffd56 2497ee72

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <uapi/linux/kfd_ioctl.h>

#include <linux/time.h>

#include <linux/mm.h>

#include <uapi/asm-generic/mman-common.h>

#include <linux/mman.h>

#include <asm/processor.h>

#include "kfd_priv.h"

#include "kfd_device_queue_manager.h"

drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/time.h>

#include "kfd_priv.h"

#include <linux/mm.h>

#include <uapi/asm-generic/mman-common.h>

#include <linux/mman.h>

#include <asm/processor.h>



/*