diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:25:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:25:41 +0200 |
| commit | 9ae76f5d8ab546660cf517bb63c64de51800955d (patch) | |
| tree | e6470cb84456e71f5e7d9a0131b7720c61cb334e /arch/blackfin/kernel/gptimers.c | |
| parent | 948f984df52511bb0efa5c026813b0c34de43aa0 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-16_09.25_Mon
Diffstat (limited to 'arch/blackfin/kernel/gptimers.c')
| -rw-r--r-- | arch/blackfin/kernel/gptimers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/gptimers.c b/arch/blackfin/kernel/gptimers.c index e698554895a7..3a3e9615b002 100644 --- a/arch/blackfin/kernel/gptimers.c +++ b/arch/blackfin/kernel/gptimers.c @@ -10,8 +10,8 @@ #include <linux/kernel.h> #include <linux/module.h> +#include <linux/io.h> -#include <asm/io.h> #include <asm/blackfin.h> #include <asm/gptimers.h> |