diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 12:33:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 12:33:02 -0800 |
commit | fb1beb29b5c531b12485d7c32174a77120590481 (patch) | |
tree | cb7d1d9733d351ae0ec7acda4851b27acd10abca /include/pcmcia/mem_op.h | |
parent | 478e4e9d7a618379676b17e64583ff3622f2fec5 (diff) | |
parent | 9fea84f46a821aa1ff2d034ffda8ad33bff48015 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: CodingStyle fixes
pcmcia: remove unused IRQ_FIRST_SHARED
Diffstat (limited to 'include/pcmcia/mem_op.h')
-rw-r--r-- | include/pcmcia/mem_op.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/pcmcia/mem_op.h b/include/pcmcia/mem_op.h index 8d19b9401a5..0fa06e5d537 100644 --- a/include/pcmcia/mem_op.h +++ b/include/pcmcia/mem_op.h @@ -15,8 +15,8 @@ #ifndef _LINUX_MEM_OP_H #define _LINUX_MEM_OP_H +#include <linux/io.h> #include <asm/uaccess.h> -#include <asm/io.h> /* If UNSAFE_MEMCPY is defined, we use the (optimized) system routines |