patch-2.2.4 linux/drivers/block/sl82c105.c

• Lines: 23
• Date: Wed Mar 10 21:48:46 1999
• Orig file: v2.2.3/linux/drivers/block/sl82c105.c
• Orig date: Thu Nov 19 09:56:28 1998

diff -u --recursive --new-file v2.2.3/linux/drivers/block/sl82c105.c linux/drivers/block/sl82c105.c
@@ -1,3 +1,4 @@
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/timer.h>
@@ -19,7 +20,6 @@
 	struct pci_dev *dev = hwif->pci_dev;
 	unsigned short t16;
 	unsigned int t32;
-
 	pci_read_config_word(dev, PCI_COMMAND, &t16);
 	printk("SL82C105 command word: %x\n",t16);
         t16 |= PCI_COMMAND_IO;
@@ -28,7 +28,9 @@
 	pci_read_config_dword(dev, 0x44, &t32);
 	printk("IDE timing: %08x, resetting to PIO0 timing\n",t32);
 	pci_write_config_dword(dev, 0x44, 0x03e4);
+#ifndef CONFIG_MBX
 	pci_read_config_dword(dev, 0x40, &t32);
 	printk("IDE control/status register: %08x\n",t32);
 	pci_write_config_dword(dev, 0x40, 0x10ff08a1);
+#endif /* CONFIG_MBX */
 }