Update of /cvsroot/linuxconsole/ruby/linux/arch/ia64/dig
In directory usw-pr-cvs1:/tmp/cvs-serv1749/linux/arch/ia64/dig
Modified Files:
setup.c
Log Message:
Synced to 2.5.7
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ia64/dig/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 15 Mar 2002 18:59:28 -0000 1.1
+++ setup.c 22 Mar 2002 20:13:57 -0000 1.2
@@ -33,6 +33,7 @@
* is sufficient (the IDE driver will autodetect the drive geometry).
*/
char drive_info[4*16];
+extern int pcat_compat;
void __init
dig_setup (char **cmdline_p)
@@ -79,13 +80,19 @@
screen_info.orig_video_ega_bx = 3; /* XXX fake */
}
-void
+void __init
dig_irq_init (void)
{
- /*
- * Disable the compatibility mode interrupts (8259 style), needs IN/OUT support
- * enabled.
- */
- outb(0xff, 0xA1);
- outb(0xff, 0x21);
+ if (pcat_compat) {
+ /*
+ * Disable the compatibility mode interrupts (8259 style), needs IN/OUT support
+ * enabled.
+ */
+ printk("%s: Disabling PC-AT compatible 8259 interrupts\n", __FUNCTION__);
+ outb(0xff, 0xA1);
+ outb(0xff, 0x21);
+ } else {
+ printk("%s: System doesn't have PC-AT compatible dual-8259 setup. "
+ "Nothing to be done\n", __FUNCTION__);
+ }
}
|
