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/mm/highmem.c | |
| parent | a9a07d40bc9c57881555b64fe8bf66fd28e2f13a (diff) | |
| parent | 711e5b4520986380700e6f095608021cf087170e (diff) | |
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/mm/highmem.c')
| -rw-r--r-- | arch/microblaze/mm/highmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/mm/highmem.c b/arch/microblaze/mm/highmem.c index 7d78838e8bfa..5a92576fad92 100644 --- a/arch/microblaze/mm/highmem.c +++ b/arch/microblaze/mm/highmem.c @@ -20,8 +20,8 @@ * highmem.h by Benjamin Herrenschmidt (c) 2009 IBM Corp. */ +#include <linux/export.h> #include <linux/highmem.h> -#include <linux/module.h> /* * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap |