diff options
author | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 00:26:44 -0400 |
commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /arch/alpha/kernel/sys_sio.c | |
parent | 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff) | |
parent | e8b8c977734193adedf2b0f607d6252c78e86394 (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/kernel/sys_sio.c')
-rw-r--r-- | arch/alpha/kernel/sys_sio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c index 14b5a753aba5..ee7b9009ebb4 100644 --- a/arch/alpha/kernel/sys_sio.c +++ b/arch/alpha/kernel/sys_sio.c | |||
@@ -78,7 +78,7 @@ alphabook1_init_arch(void) | |||
78 | * example, sound boards seem to like using IRQ 9. | 78 | * example, sound boards seem to like using IRQ 9. |
79 | * | 79 | * |
80 | * This is NOT how we should do it. PIRQ0-X should have | 80 | * This is NOT how we should do it. PIRQ0-X should have |
81 | * their own IRQ's, the way intel uses the IO-APIC irq's. | 81 | * their own IRQs, the way intel uses the IO-APIC IRQs. |
82 | */ | 82 | */ |
83 | 83 | ||
84 | static void __init | 84 | static void __init |