diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 09:36:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-07 09:36:55 -0700 |
| commit | 8a2e21038df74c4401f422346b9371a959c21438 (patch) | |
| tree | 794986757facadd0b92c723c6dc561ca2e8d0dc5 /include | |
| parent | 7244d545c123ff33a3a5bff7fcb96a07778c32d1 (diff) | |
| parent | 9a412847fbe396563acf2a78d5830c9c6c5a5d43 (diff) | |
| download | linux-3.10-8a2e21038df74c4401f422346b9371a959c21438.tar.gz linux-3.10-8a2e21038df74c4401f422346b9371a959c21438.tar.bz2 linux-3.10-8a2e21038df74c4401f422346b9371a959c21438.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix se73180 platform device registration.
sh: ioremap() through PMB needs asm/mmu.h.
sh: voyagergx: Fix build warnings.
sh: Fix SH4-202 clock fwk set_rate() mismatch.
sh: microdev: Fix compile warnings.
sh: Fix in_nmi symbol build error.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sh/se73180.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-sh/se73180.h b/include/asm-sh/se73180.h index 3a4acb3e38a..907c062b4c9 100644 --- a/include/asm-sh/se73180.h +++ b/include/asm-sh/se73180.h @@ -1,9 +1,7 @@ -#ifndef __ASM_SH_HITACHI_SE73180_H -#define __ASM_SH_HITACHI_SE73180_H +#ifndef __ASM_SH_SE73180_H +#define __ASM_SH_SE73180_H /* - * include/asm-sh/se/se73180.h - * * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp> * * SH-Mobile SolutionEngine 73180 support @@ -62,4 +60,7 @@ #define __IO_PREFIX sh73180se #include <asm/io_generic.h> -#endif /* __ASM_SH_HITACHI_SE73180_H */ +/* arch/sh/boards/se/73180/irq.c */ +int shmse_irq_demux(int irq); + +#endif /* __ASM_SH_SE73180_H */ |