Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/paulg/linux * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: fsl-rio: fix compile error
torvalds · Nov 15, 2011 · 642ba5e · 642ba5e
2 parents 80f01ca + e0ce42e
commit 642ba5e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
@@ -23,7 +23,7 @@
  */
 
 #include <linux/init.h>
-#include <linux/export.h>
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>