summaryrefslogtreecommitdiffstats
path: root/lib/klist.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2012-05-15 09:21:26 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2012-05-15 09:21:26 +0200
commitb29e2679d0da91c60d3ac190d9c3bd65ac2f68c5 (patch)
tree518ec8f4bfd316e91bcc30f434edb78529557eba /lib/klist.c
parentcrypto: ux500 - Add driver for HASH hardware (diff)
parentMerge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff)
downloadlinux-b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5.tar.xz
linux-b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to add prerequisite for ARM ux500 crypto support.
Diffstat (limited to 'lib/klist.c')
-rw-r--r--lib/klist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/klist.c b/lib/klist.c
index 573d6068a42e..0874e41609a6 100644
--- a/lib/klist.c
+++ b/lib/klist.c
@@ -35,7 +35,7 @@
*/
#include <linux/klist.h>
-#include <linux/module.h>
+#include <linux/export.h>
#include <linux/sched.h>
/*