diff options
| author | Rodrigo Vivi <[email protected]> | 2018-07-23 09:13:12 -0700 | 
|---|---|---|
| committer | Rodrigo Vivi <[email protected]> | 2018-07-23 09:13:12 -0700 | 
| commit | c74a7469f97c0f40b46e82ee979f9fb1bb6e847c (patch) | |
| tree | f2690a1a916b73ef94657fbf0e0141ae57701825 /arch/nds32/lib | |
| parent | 6f15a7de86c8cf2dc09fc9e6d07047efa40ef809 (diff) | |
| parent | 500775074f88d9cf5416bed2ca19592812d62c41 (diff) | |
Merge drm/drm-next into drm-intel-next-queued
We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.
Signed-off-by: Rodrigo Vivi <[email protected]>
Diffstat (limited to 'arch/nds32/lib')
| -rw-r--r-- | arch/nds32/lib/copy_page.S | 3 | 
1 files changed, 3 insertions, 0 deletions
| diff --git a/arch/nds32/lib/copy_page.S b/arch/nds32/lib/copy_page.S index 4a2ff85f17ee..f8701ed161a8 100644 --- a/arch/nds32/lib/copy_page.S +++ b/arch/nds32/lib/copy_page.S @@ -2,6 +2,7 @@  // Copyright (C) 2005-2017 Andes Technology Corporation  #include <linux/linkage.h> +#include <asm/export.h>  #include <asm/page.h>  	.text @@ -16,6 +17,7 @@ ENTRY(copy_page)  	popm	$r2, $r10  	ret  ENDPROC(copy_page) +EXPORT_SYMBOL(copy_page)  ENTRY(clear_page)  	pushm	$r1, $r9 @@ -35,3 +37,4 @@ ENTRY(clear_page)  	popm	$r1, $r9          ret  ENDPROC(clear_page) +EXPORT_SYMBOL(clear_page) |