diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 17:59:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 17:59:11 -0400 |
| commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
| tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/kernel/iosapic.c | |
| parent | 4744b43431e8613f920c5cba88346756f53c5165 (diff) | |
| parent | 7f30491ccd28627742e37899453ae20e3da8e18f (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/kernel/iosapic.c')
| -rw-r--r-- | arch/ia64/kernel/iosapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 3bc2fa64f87f..5c4674ae8aea 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | * systems, we use one-to-one mapping between IA-64 vector and IRQ. A | 69 | * systems, we use one-to-one mapping between IA-64 vector and IRQ. A |
| 70 | * platform can implement platform_irq_to_vector(irq) and | 70 | * platform can implement platform_irq_to_vector(irq) and |
| 71 | * platform_local_vector_to_irq(vector) APIs to differentiate the mapping. | 71 | * platform_local_vector_to_irq(vector) APIs to differentiate the mapping. |
| 72 | * Please see also include/asm-ia64/hw_irq.h for those APIs. | 72 | * Please see also arch/ia64/include/asm/hw_irq.h for those APIs. |
| 73 | * | 73 | * |
| 74 | * To sum up, there are three levels of mappings involved: | 74 | * To sum up, there are three levels of mappings involved: |
| 75 | * | 75 | * |