rpms/kernel/devel kernel-2.6.spec,1.1394,1.1395

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bring back -ac IDE fixes



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1394
retrieving revision 1.1395
diff -u -r1.1394 -r1.1395
--- kernel-2.6.spec	22 Jun 2005 18:36:57 -0000	1.1394
+++ kernel-2.6.spec	23 Jun 2005 01:25:16 -0000	1.1395
@@ -330,7 +330,7 @@
 Patch1640: linux-2.6.11-panic-stackdump.patch
 Patch1650: linux-2.6.11-acpi-thinkpad-c2c3.patch
 Patch1700: linux-2.6.10-revert-module-invalidparam.patch
-Patch1710: linux-2.6.12rc-ac-ide-fixes.patch
+Patch1710: linux-2.6.12-ac-ide-fixes.patch
 Patch1720: linux-2.6.9-module_version.patch
 Patch1730: linux-2.6.9-spinlock-debug-panic.patch
 Patch1740: linux-2.6.11-default-elevator.patch
@@ -758,8 +758,7 @@
 # Don't barf on obsolete module parameters.
 %patch1700 -p1
 # Numerous IDE fixes.
-# FIXME: NEEDS REDIFFING
-#%patch1710 -p1
+%patch1710 -p1
 
 # Add missing MODULE_VERSION tags to some modules.
 %patch1720 -p1
@@ -1258,6 +1257,7 @@
 %changelog
 * Wed Jun 22 2005 Dave Jones <davej at redhat.com>
 - 2.6.12-git4
+- Bring back the IDE fixes from -ac
 
 * Tue Jun 21 2005 Dave Jones <davej at redhat.com>
 - 2.6.12-git3