[IA64] Manual merge fix for 3 files

[linux-2.6] / arch / sparc64 / kernel / auxio.c

diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c
index a0716ccc2f4a2227c211f19a77017b2790379a31..8852c20c8d9928e8d09bf7a35f4a76a0f2d4b71a 100644 (file)
--- a/arch/sparc64/kernel/auxio.c
+++ b/arch/sparc64/kernel/auxio.c
@@ -16,7 +16,7 @@
 #include <asm/ebus.h>
 #include <asm/auxio.h>
 
-/* This cannot be static, as it is referenced in entry.S */
+/* This cannot be static, as it is referenced in irq.c */
 void __iomem *auxio_register = NULL;
 
 enum auxio_type {