diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-22 10:44:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-22 10:44:41 +1000 |
| commit | 281d1bbd34b734e4f22b30b6f3b673dda46a7470 (patch) | |
| tree | f67a2d45d248e9deaa1c68d3f8f33cdf476daacd /arch/arm64/kernel/module.c | |
| parent | bfa55bd4990815b055162b6d5d031f37a39942a5 (diff) | |
| parent | b942c653ae265abbd31032f3b4f5f857e5c7c723 (diff) | |
Merge remote-tracking branch 'origin/master' into drm-next
Backmerge Linus tree after rc5 + drm-fixes went in.
There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.
Conflicts:
drivers/gpu/drm/amd/amdkfd/Makefile
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
drivers/gpu/drm/amd/include/kgd_kfd_interface.h
drivers/gpu/drm/i915/intel_runtime_pm.c
drivers/gpu/drm/radeon/radeon_kfd.c
Diffstat (limited to 'arch/arm64/kernel/module.c')
| -rw-r--r-- | arch/arm64/kernel/module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index fd027b101de5..9b6f71db2709 100644 --- a/arch/arm64/kernel/module.c +++ b/arch/arm64/kernel/module.c @@ -25,6 +25,7 @@ #include <linux/mm.h> #include <linux/moduleloader.h> #include <linux/vmalloc.h> +#include <asm/alternative.h> #include <asm/insn.h> #include <asm/sections.h> |