rpms/kernel/F-8 linux-2.6-libata-pegasos-fix.patch,1.1,1.2

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21014

Modified Files:
	linux-2.6-libata-pegasos-fix.patch 
Log Message:
replace with official patch


linux-2.6-libata-pegasos-fix.patch:

Index: linux-2.6-libata-pegasos-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-libata-pegasos-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-libata-pegasos-fix.patch	15 Feb 2008 23:58:52 -0000	1.1
+++ linux-2.6-libata-pegasos-fix.patch	22 Feb 2008 00:39:35 -0000	1.2
@@ -1,23 +1,32 @@
-From olaf at aepfle.de Mon Jan 21 20:39:30 2008
-From: Olaf Hering <olaf at aepfle.de>
-Subject: revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos
-Date: Mon, 21 Jan 2008 20:39:30 +1100
-X-Patchwork-ID: 16281
-
-commit 6d98bda79bea0e1be26c0767d0e9923ad3b72f2e changed the init order
-for chrp_pci_fixup_vt8231_ata()
-It can not work anymore because either the irq is not yet set to 14 or
-pci_get_device() returns nothing. At least the printk() in
-chrp_pci_fixup_vt8231_ata() does not trigger anymore.
-pata_via works again on Pegasos with the change below.
-
-Signed-off-by: Olaf Hering <olaf at aepfle.de>
-
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=092ca5bd61da6344f3b249754b337f2d48dfe08d
+Commit:     092ca5bd61da6344f3b249754b337f2d48dfe08d
+Parent:     3ca6644e5cc6ee7700b158fd5b4e8c48899118c6
+Author:     Olaf Hering <olaf at aepfle.de>
+AuthorDate: Mon Jan 21 20:39:30 2008 +1100
+Committer:  Paul Mackerras <paulus at samba.org>
+CommitDate: Fri Jan 25 22:52:55 2008 +1100
 
+    [POWERPC] Revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos
+    
+    Commit 6d98bda79bea0e1be26c0767d0e9923ad3b72f2e changed the init order
+    for chrp_pci_fixup_vt8231_ata().
+    
+    It can not work anymore because either the irq is not yet set to 14 or
+    pci_get_device() returns nothing.  At least the printk() in
+    chrp_pci_fixup_vt8231_ata() does not trigger anymore.
+    pata_via works again on Pegasos with the change below.
+    
+    Signed-off-by: Olaf Hering <olaf at aepfle.de>
+    Signed-off-by: Paul Mackerras <paulus at samba.org>
 ---
+ arch/powerpc/platforms/chrp/pci.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
+index d51f83a..609c46d 100644
 --- a/arch/powerpc/platforms/chrp/pci.c
 +++ b/arch/powerpc/platforms/chrp/pci.c
-@@ -354,7 +354,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_WI
+@@ -354,7 +354,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
   * mode as well. The same fixup must be done to the class-code property in
   * the IDE node /pci at 80000000/ide at C,1
   */
@@ -26,10 +35,9 @@
  {
  	u8 progif;
  	struct pci_dev *viaisa;
-@@ -375,4 +375,4 @@ static void __devinit chrp_pci_fixup_vt8
+@@ -375,4 +375,4 @@ static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
  
  	pci_dev_put(viaisa);
  }
 -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
-