patch-2.3.32 linux/arch/arm/kernel/hw-footbridge.c

• Lines: 24
• Date: Mon Dec 13 16:26:27 1999
• Orig file: v2.3.31/linux/arch/arm/kernel/hw-footbridge.c
• Orig date: Fri Oct 22 13:21:44 1999

diff -u --recursive --new-file v2.3.31/linux/arch/arm/kernel/hw-footbridge.c linux/arch/arm/kernel/hw-footbridge.c
@@ -678,6 +678,7 @@
 	 */
 	if (machine_is_netwinder()) {
 		unsigned long flags;
+		extern int isapnp_disable;
 
 		wb977_init();
 		cpld_init();
@@ -686,6 +687,15 @@
 		spin_lock_irqsave(&gpio_lock, flags);
 		gpio_modify_op(GPIO_RED_LED|GPIO_GREEN_LED, DEFAULT_LEDS);
 		spin_unlock_irqrestore(&gpio_lock, flags);
+
+#ifdef CONFIG_ISAPNP
+		/*
+		 * We must not use the kernels ISAPnP code
+		 * on the NetWinder - it will reset the settings
+		 * for the WaveArtist chip and render it inoperable.
+		 */
+		isapnp_disable = 1;
+#endif
 	}
 #endif
 #ifdef CONFIG_CATS