r4136 - in dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-09-07 06:21:11 +0000 (Wed, 07 Sep 2005)
New Revision: 4136

Added:
   dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-ide-ppp-pmac-build.dpatch
Modified:
   dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
+  * drivers-ide-ppp-pmac-build.dpatch
+    Make sure BLK_DEV_IDEDMA_PCI is defined for pmac ide driver builds
+    (closes: #321442)


Modified: dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-09-06 18:02:27 UTC (rev 4135)
+++ dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-09-07 06:21:11 UTC (rev 4136)
@@ -236,8 +236,12 @@
     Fix SKB leak in ip6_input_finish()
     From 2.6.12.6
 
- -- Simon Horman <horms at debian.org>  Wed, 31 Aug 2005 18:03:53 +0900
+  * drivers-ide-ppp-pmac-build.dpatch
+    Make sure BLK_DEV_IDEDMA_PCI is defined for pmac ide driver builds
+    (closes: #321442)
 
+ -- Simon Horman <horms at debian.org>  Wed,  7 Sep 2005 15:17:21 +0900
+
 kernel-source-2.6.8 (2.6.8-16) unstable; urgency=low
 
   * smbfs-overrun.dpatch:

Added: dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-ide-ppp-pmac-build.dpatch
===================================================================
--- dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-ide-ppp-pmac-build.dpatch	2005-09-06 18:02:27 UTC (rev 4135)
+++ dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-ide-ppp-pmac-build.dpatch	2005-09-07 06:21:11 UTC (rev 4136)
@@ -0,0 +1,29 @@
+commit 0ac72b351bdf29252e4181b07fa7feed8501b5d2
+tree bdf925efb7821b15575b2f79a34c459c1a41a0c0
+parent c40d3d38a8f04fff4394c7323db239bce780db60
+author Juha-Matti Tapio <jmtapio at verkkotelakka.net> Thu, 18 Aug 2005 22:13:44 +0200
+committer Bartlomiej Zolnierkiewicz <bzolnier at elka.pw.edu.pl> Thu, 18 Aug 2005 22:13:44 +0200
+
+    [PATCH] ide: fix the BLK_DEV_IDEDMA_PCI dependency for drivers/ide/ppc/pmac.c
+    
+    drivers/ide/ppc/pmac.c uses symbols ide_build_sglist,
+    __ide_dma_off_quietly, __ide_dma_on and __ide_dma_timeout when
+    CONFIG_BLK_DEV_IDEDMA_PMAC is defined. The declarations for these
+    symbols (in ide.h) depend on CONFIG_BLK_DEV_IDEDMA_PCI. There is a
+    missing dependency for this in drivers/ide/Kconfig which causes
+    drivers/ide/ppc/pmac.c to fail to build if CONFIG_BLK_DEV_IDEDMA_PMAC
+    is selected but CONFIG_BLK_DEV_IDEDMA_PCI is not.
+    
+    Signed-off-by: Juha-Matti Tapio <jmtapio at verkkotelakka.net>
+
+diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
+--- a/drivers/ide/Kconfig
++++ b/drivers/ide/Kconfig
+@@ -764,6 +764,7 @@ config BLK_DEV_IDE_PMAC_ATA100FIRST
+ config BLK_DEV_IDEDMA_PMAC
+ 	bool "PowerMac IDE DMA support"
+ 	depends on BLK_DEV_IDE_PMAC
++	select BLK_DEV_IDEDMA_PCI
+ 	help
+ 	  This option allows the driver for the built-in IDE controller on
+ 	  Power Macintoshes and PowerBooks to use DMA (direct memory access)

Modified: dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-09-06 18:02:27 UTC (rev 4135)
+++ dists/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-09-07 06:21:11 UTC (rev 4136)
@@ -60,3 +60,4 @@
 + genelink-usbnet-skb-typo.dpatch
 + fix-memory-leak-in-sg.c-seq_file.dpatch
 + ipv6-skb-leak.dpatch
++ drivers-ide-ppp-pmac-build.dpatch