diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-02 15:25:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-02 15:25:27 -0700 |
| commit | 00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3 (patch) | |
| tree | 69cc9c6cd24175d704de5a50db14cdb05df3e609 /arch/blackfin/kernel | |
| parent | f365ad5fc001cbd02968a376e0aecffe52ce79e1 (diff) | |
| parent | a4ed1e41a734d77c9a83a88a8736e19b68e6a2a0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
8250 Serial Driver: revert extra IRQ flag definition patch
Blackfin arch: update anomaly headers from toolchain trunk
Blackfin arch: Remove bad and usless code
Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
Blackfin arch: Fix typo. it should be _outsw_8
Blackfin arch: Cleanup no functional changes
Diffstat (limited to 'arch/blackfin/kernel')
| -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 e698554895a..3a3e9615b00 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> |