rpms/kernel/FC-4 linux-2.6-pcmcia-disable-warning.patch, NONE, 1.1 kernel-2.6.spec, 1.1483, 1.1484

[fedora-cvs-commits redhat com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-pcmcia-disable-warning.patch 
Log Message:
disable warning



linux-2.6-pcmcia-disable-warning.patch:
 pcmcia_ioctl.c |   11 -----------
 1 files changed, 11 deletions(-)

--- NEW FILE linux-2.6-pcmcia-disable-warning.patch ---
FC4 isnt going to get the new pcmcia tools, so disable this warning.

--- linux-2.6.14/drivers/pcmcia/pcmcia_ioctl.c~	2005-10-29 02:41:36.000000000 -0400
+++ linux-2.6.14/drivers/pcmcia/pcmcia_ioctl.c	2005-10-29 02:41:55.000000000 -0400
@@ -408,17 +408,6 @@ static int ds_open(struct inode *inode, 
     s->user = user;
     file->private_data = user;
 
-    if (!warning_printed) {
-	    printk(KERN_INFO "pcmcia: Detected deprecated PCMCIA ioctl "
-			"usage.\n");
-	    printk(KERN_INFO "pcmcia: This interface will soon be removed from "
-			"the kernel; please expect breakage unless you upgrade "
-			"to new tools.\n");
-	    printk(KERN_INFO "pcmcia: see http://www.kernel.org/pub/linux/";
-			"utils/kernel/pcmcia/pcmcia.html for details.\n");
-	    warning_printed = 1;
-    }
-
     if (s->pcmcia_state.present)
 	queue_event(user, CS_EVENT_CARD_INSERTION);
     return 0;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1483
retrieving revision 1.1484
diff -u -r1.1483 -r1.1484
--- kernel-2.6.spec	28 Oct 2005 06:15:08 -0000	1.1483
+++ kernel-2.6.spec	29 Oct 2005 06:44:09 -0000	1.1484
@@ -299,6 +299,8 @@
 Patch1302: linux-2.6-net-atm-lanai-nodev-rmmod.patch
 Patch1303: linux-2.6-net-acenic-use-after-free.patch
 
+Patch1400: linux-2.6-pcmcia-disable-warning.patch
+
 # Netdump and Diskdump bits.
 Patch1500: linux-2.6-crashdump-common.patch
 Patch1501: linux-2.6-netdump.patch
@@ -690,6 +692,9 @@
 # Acenic use after free
 %patch1303 -p1
 
+# disable pcmcia warnings
+%patch1400 -p1
+
 # netdump bits
 %patch1500 -p1
 %patch1501 -p1
@@ -1206,6 +1211,9 @@
 %endif
 
 %changelog
+* Sat Oct 29 2005 Dave Jones <davej redhat com>
+- Disable deprecation warning in PCMCIA ioctl.
+
 * Thu Oct 27 2005 Dave Jones <davej redhat com>
 - Rebase to 2.6.14