diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/asm-mips/dec/kn02.h | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/dec/kn02.h')
| -rw-r--r-- | include/asm-mips/dec/kn02.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-mips/dec/kn02.h b/include/asm-mips/dec/kn02.h index 8319ad77b250..93430b5f4724 100644 --- a/include/asm-mips/dec/kn02.h +++ b/include/asm-mips/dec/kn02.h | |||
| @@ -82,11 +82,9 @@ | |||
| 82 | 82 | ||
| 83 | #ifndef __ASSEMBLY__ | 83 | #ifndef __ASSEMBLY__ |
| 84 | 84 | ||
| 85 | #include <linux/spinlock.h> | ||
| 86 | #include <linux/types.h> | 85 | #include <linux/types.h> |
| 87 | 86 | ||
| 88 | extern u32 cached_kn02_csr; | 87 | extern u32 cached_kn02_csr; |
| 89 | extern spinlock_t kn02_lock; | ||
| 90 | extern void init_kn02_irqs(int base); | 88 | extern void init_kn02_irqs(int base); |
| 91 | #endif | 89 | #endif |
| 92 | 90 | ||