summaryrefslogtreecommitdiffstats
path: root/arch/x86/um/delay.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-01 14:23:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-01 14:23:42 -0400
commitaeb35d6b74174ed08daab84e232b456bbd89d1d9 (patch)
tree909badf4e6e83d09a3ef28382dbf7dae56306833 /arch/x86/um/delay.c
parent7a66ecfd319af8fe4f4c3eadf019b998c93d6687 (diff)
parenta47177d360a22ddaa7584186e7e1c74e49220bbe (diff)
downloadtalos-op-linux-aeb35d6b74174ed08daab84e232b456bbd89d1d9.tar.gz
talos-op-linux-aeb35d6b74174ed08daab84e232b456bbd89d1d9.zip
Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 header cleanups from Ingo Molnar: "This tree is a cleanup of the x86 tree reducing spurious uses of module.h - which should improve build performance a bit" * 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads x86/apic: Remove duplicated include from probe_64.c x86/ce4100: Remove duplicated include from ce4100.c x86/headers: Include spinlock_types.h in x8664_ksyms_64.c for missing spinlock_t x86/platform: Delete extraneous MODULE_* tags fromm ts5500 x86: Audit and remove any remaining unnecessary uses of module.h x86/kvm: Audit and remove any unnecessary uses of module.h x86/xen: Audit and remove any unnecessary uses of module.h x86/platform: Audit and remove any unnecessary uses of module.h x86/lib: Audit and remove any unnecessary uses of module.h x86/kernel: Audit and remove any unnecessary uses of module.h x86/mm: Audit and remove any unnecessary uses of module.h x86: Don't use module.h just for AUTHOR / LICENSE tags
Diffstat (limited to 'arch/x86/um/delay.c')
-rw-r--r--arch/x86/um/delay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/delay.c b/arch/x86/um/delay.c
index f3fe1a688f7e..a8fb7ca4822b 100644
--- a/arch/x86/um/delay.c
+++ b/arch/x86/um/delay.c
@@ -7,7 +7,7 @@
* published by the Free Software Foundation.
*/
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/kernel.h>
#include <linux/delay.h>
#include <asm/param.h>
OpenPOWER on IntegriCloud