[parisc-linux-cvs] linux tsbogend

[Thomas Bogendoerfer]

On Thu, Feb 07, 2002 at 03:07:12PM -0700, Thomas Bogendoerfer wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	tsbogend	02/02/07 15:07:12
> 
> Modified files:
> 	.              : Makefile 
> 
> Log message:
> 2.4.17-pa21:
> superio.c and usb-ohci.c changes to get usb working. The hotplug package
> must be installed, otherwise the kernel crashes after a usb device gets
> detected


Index: arch/parisc/kernel/superio.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/superio.c,v
retrieving revision 1.16
diff -u -p -r1.16 superio.c
--- arch/parisc/kernel/superio.c	2001/12/04 02:12:39	1.16
+++ arch/parisc/kernel/superio.c	2002/02/07 21:08:41
@@ -234,7 +234,7 @@ superio_init(struct superio_device *sio)
 	pci_write_config_byte (pdev, IR_IDE, 0x07); /* IDE1 on IRQ7 */
 	
 	/* Set USB and IDE to level triggered interrupts, rest to edge */
-	pci_write_config_byte (pdev, TRIGGER_1, 0x81); /* IRQ 1 and 7 */
+	pci_write_config_byte (pdev, TRIGGER_1, 0x82); /* IRQ 1 and 7 */
 
 	pci_enable_device(pdev);
 
Index: drivers/usb/usb-ohci.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/usb/usb-ohci.c,v
retrieving revision 1.14
diff -u -p -r1.14 usb-ohci.c
--- drivers/usb/usb-ohci.c	2002/01/03 22:37:20	1.14
+++ drivers/usb/usb-ohci.c	2002/02/07 21:27:40
@@ -69,7 +69,9 @@
 #include <asm/system.h>
 #include <asm/unaligned.h>
 
+#ifndef CONFIG_SUPERIO		/* superio doesn't work with this */
 #define OHCI_USE_NPS		// force NoPowerSwitching mode
+#endif
 // #define OHCI_VERBOSE_DEBUG	/* not always helpful */
 
 #include "usb-ohci.h"




-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
good idea.                                 [ Alexander Viro on linux-kernel ]