rpms/kernel/FC-6 linux-2.6-libata-restore-combined-mode.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8092

Modified Files:
	linux-2.6-libata-restore-combined-mode.patch 
Log Message:
Yet another type in the combined_mode patch.


linux-2.6-libata-restore-combined-mode.patch:
 drivers/ata/Kconfig      |    5 ++
 drivers/ata/libata-sff.c |   20 +++++---
 drivers/pci/quirks.c     |  113 +++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/ioport.h   |    1 
 kernel/resource.c        |   21 ++++++++
 5 files changed, 154 insertions(+), 6 deletions(-)

Index: linux-2.6-libata-restore-combined-mode.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-libata-restore-combined-mode.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-libata-restore-combined-mode.patch	19 Jul 2007 18:02:49 -0000	1.2
+++ linux-2.6-libata-restore-combined-mode.patch	19 Jul 2007 18:20:30 -0000	1.3
@@ -41,7 +41,7 @@
 +		conflict = ____request_resource(&ioport_resource, &res);
 +		while (conflict->child)
 +			conflict = ____request_resource(conflict, &res);
-+		if (strcmp(conflict->name, "libata"))
++		if (strcmp(conflict->name, "libata")) {
 +			dev_printk(KERN_WARNING, host->dev,
 +				   "0x%0lX IDE port busy -- conflict with %s\n",
 +				   cmd_port, conflict->name);