diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 19:50:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-26 19:50:22 -0800 |
| commit | 2b37e9a28afbd11f899738e912fb4a617a74b462 (patch) | |
| tree | 9494e8bfed44e08f47d4b4c6007dc189f7c7896f /arch/microblaze/kernel/sys_microblaze.c | |
| parent | Merge branch 'for-upstream' of git://openrisc.net/jonas/linux (diff) | |
| parent | asm-generic: io: Fix ioread16/32be and iowrite16/32be (diff) | |
| download | linux-dev-2b37e9a28afbd11f899738e912fb4a617a74b462.tar.xz linux-dev-2b37e9a28afbd11f899738e912fb4a617a74b462.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"Microblaze changes.
After my discussion with Arnd I have also added there asm-generic io
patch which is Acked by him and Geert."
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
asm-generic: io: Fix ioread16/32be and iowrite16/32be
microblaze: Do not use module.h in files which are not modules
microblaze: Fix coding style issues
microblaze: Add missing return from debugfs_tlb
microblaze: Makefile clean
microblaze: Add .gitignore entries for auto-generated files
microblaze: Fix strncpy_from_user macro
Diffstat (limited to 'arch/microblaze/kernel/sys_microblaze.c')
| -rw-r--r-- | arch/microblaze/kernel/sys_microblaze.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c index 63647c586b43..f905b3ae68c7 100644 --- a/arch/microblaze/kernel/sys_microblaze.c +++ b/arch/microblaze/kernel/sys_microblaze.c @@ -13,6 +13,7 @@ */ #include <linux/errno.h> +#include <linux/export.h> #include <linux/mm.h> #include <linux/smp.h> #include <linux/syscalls.h> @@ -24,14 +25,12 @@ #include <linux/sys.h> #include <linux/ipc.h> #include <linux/file.h> -#include <linux/module.h> #include <linux/err.h> #include <linux/fs.h> #include <linux/semaphore.h> #include <linux/uaccess.h> #include <linux/unistd.h> #include <linux/slab.h> - #include <asm/syscalls.h> asmlinkage long sys_mmap(unsigned long addr, unsigned long len, |