diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:47:28 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:47:28 -0200 |
| commit | 642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03 (patch) | |
| tree | 1d169633e0c0045bf1f5d215f68791b36228f146 /arch/powerpc | |
| parent | 80f01ca1fce2d5045b98f01989017767339b8700 (diff) | |
| parent | e0ce42e19ce1978a5aee33b2954d7e1a730e88c4 (diff) | |
| download | talos-obmc-linux-642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03.tar.gz talos-obmc-linux-642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03.zip | |
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
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_rio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index de170fd5ba4e..22ffccd8bef5 100644 --- 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> |
