rpms/kernel/FC-4 kernel-2.6.spec,1.1561,1.1562

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
disable pcmcia obsolete warnings.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1561
retrieving revision 1.1562
diff -u -r1.1561 -r1.1562
--- kernel-2.6.spec	6 Jan 2006 05:59:18 -0000	1.1561
+++ kernel-2.6.spec	6 Jan 2006 06:01:22 -0000	1.1562
@@ -345,9 +345,7 @@
 Patch1770: linux-2.6-valid-ether-addr.patch
 Patch1780: linux-2.6-firmware-loader-timeout.patch
 Patch1790: linux-2.6-x86-hp-reboot.patch
-
-# ACPI patches.
-Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch
+Patch1800: linux-2.6-pcmcia-disable-warning.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -362,6 +360,9 @@
 Patch2002: linux-2.6-vm-debug.patch
 Patch2003: linux-2.6-vm-clear-unreclaimable.patch
 
+# ACPI patches.
+Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch
+
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here. 
@@ -771,9 +772,7 @@
 %patch1780 -p1
 # Set reboot through BIOS for HP laptops.
 %patch1790 -p1
-
-# ACPI patches.
-# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
+# Disable deprecation warning in old PCMCIA code.
 %patch1800 -p1
 
 # Warn about obsolete functionality usage.
@@ -794,6 +793,10 @@
 # OOM killer tweaks.
 %patch2003 -p1
 
+# ACPI patches.
+# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
+%patch2100 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream