r3846 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-01-15 21:47:18 +0100 (Tue, 15 Jan 2008)
New Revision: 3846

Added:
   branches/src/target/kernel/2.6.24.x/patches/pnp_fixes.patch
Modified:
   branches/src/target/kernel/2.6.24.x/patches/series
Log:
Applied "pnp_fixes.patch",
http://git.openmoko.org/?p=kernel.git;a=commit;h=c7751f33688574a9512545ebc159481bac103de9

From: Samuel Ortiz <sameo at openedhand.com>

pnp_fixes-patch:
- drivers/pnp/Kconfig: also allow PnP if we only have SDIO
- drivers/pnp/resource.c (pnp_check_dma): don't request a DMA



Added: branches/src/target/kernel/2.6.24.x/patches/pnp_fixes.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/pnp_fixes.patch	2008-01-15 20:29:08 UTC (rev 3845)
+++ branches/src/target/kernel/2.6.24.x/patches/pnp_fixes.patch	2008-01-15 20:47:18 UTC (rev 3846)
@@ -0,0 +1,33 @@
+Index: linux-2.6.24-rc7/drivers/pnp/Kconfig
+===================================================================
+--- linux-2.6.24-rc7.orig/drivers/pnp/Kconfig
++++ linux-2.6.24-rc7/drivers/pnp/Kconfig
+@@ -5,7 +5,7 @@
+ menuconfig PNP
+ 	bool "Plug and Play support"
+ 	depends on HAS_IOMEM
+-	depends on ISA || ACPI
++	depends on ISA || ACPI || SDIO
+ 	---help---
+ 	  Plug and Play (PnP) is a standard for peripherals which allows those
+ 	  peripherals to be configured by software, e.g. assign IRQ's or other
+Index: linux-2.6.24-rc7/drivers/pnp/resource.c
+===================================================================
+--- linux-2.6.24-rc7.orig/drivers/pnp/resource.c
++++ linux-2.6.24-rc7/drivers/pnp/resource.c
+@@ -431,6 +431,7 @@
+ 		}
+ 	}
+ 
++#if 0
+ 	/* check if the resource is already in use, skip if the
+ 	 * device is active because it itself may be in use */
+ 	if (!dev->active) {
+@@ -438,6 +439,7 @@
+ 			return 0;
+ 		free_dma(*dma);
+ 	}
++#endif
+ 
+ 	/* check for conflicts with other pnp devices */
+ 	pnp_for_each_dev(tdev) {

Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series	2008-01-15 20:29:08 UTC (rev 3845)
+++ branches/src/target/kernel/2.6.24.x/patches/series	2008-01-15 20:47:18 UTC (rev 3846)
@@ -63,3 +63,4 @@
 qt2410-cs8900.patch
 s3c2410-qt2410-buttons.patch
 fail-unless-uimage.patch
+pnp_fixes.patch