diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 15:26:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-26 15:26:20 -0800 |
| commit | a56f3eb2cd72d4d678a63cf8cacf9d39aa8020f3 (patch) | |
| tree | 3e5e3763fce49af4ee56aaedec3c5e555c52af57 /arch/arm/lib/io-writesw-armv4.S | |
| parent | a0d60e62ea5c88a9823410e9d0929a513e29dea2 (diff) | |
| parent | 8478132a8784605fe07ede555f7277d989368d73 (diff) | |
| download | linux-a56f3eb2cd72d4d678a63cf8cacf9d39aa8020f3.tar.gz | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"This resolves the ksyms issues by reverting the commit which
introduced the breakage"
There was what I consider to be a better fix, but it's late in the rc
game, so I'll take the revert.
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
Revert "arm: move exports to definitions"
Diffstat (limited to 'arch/arm/lib/io-writesw-armv4.S')
| -rw-r--r-- | arch/arm/lib/io-writesw-armv4.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S index e335f489d1fc..269f90c51ad2 100644 --- a/arch/arm/lib/io-writesw-armv4.S +++ b/arch/arm/lib/io-writesw-armv4.S @@ -9,7 +9,6 @@ */ #include <linux/linkage.h> #include <asm/assembler.h> -#include <asm/export.h> .macro outword, rd #ifndef __ARMEB__ @@ -99,4 +98,3 @@ ENTRY(__raw_writesw) strneh ip, [r0] ret lr ENDPROC(__raw_writesw) -EXPORT_SYMBOL(__raw_writesw) |