--- linux/drivers/ide/ide-cs.c	2003-02-28 17:04:00.000000000 -0600
+++ linux.new/drivers/ide/ide-cs.c	2003-02-28 17:18:53.000000000 -0600
@@ -2,7 +2,7 @@
 
     A driver for PCMCIA IDE/ATA disk cards
 
-    ide_cs.c 1.26 1999/11/16 02:10:49
+    ide-cs.c 1.26 1999/11/16 02:10:49
 
     The contents of this file are subject to the Mozilla Public
     License Version 1.1 (the "License"); you may not use this file
@@ -66,7 +66,7 @@
 MODULE_PARM(pc_debug, "i");
 #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
 static char *version =
-"ide_cs.c 1.26 1999/11/16 02:10:49 (David Hinds)";
+"ide-cs.c 1.26 1999/11/16 02:10:49 (David Hinds)";
 #else
 #define DEBUG(n, args...)
 #endif
@@ -110,7 +110,7 @@
 static int ide_event(event_t event, int priority,
 		     event_callback_args_t *args);
 
-static dev_info_t dev_info = "ide_cs";
+static dev_info_t dev_info = "ide-cs";
 
 static dev_link_t *ide_attach(void);
 static void ide_detach(dev_link_t *);
@@ -356,7 +356,7 @@
     }
     
     if (hd < 0) {
-	printk(KERN_NOTICE "ide_cs: ide_register() at 0x%03x & 0x%03x"
+	printk(KERN_NOTICE "ide-cs: ide_register() at 0x%03x & 0x%03x"
 	       ", irq %u failed\n", io_base, ctl_base,
 	       link->irq.AssignedIRQ);
 	goto failed;
@@ -369,7 +369,7 @@
     info->node.minor = 0;
     info->hd = hd;
     link->dev = &info->node;
-    printk(KERN_INFO "ide_cs: %s: Vcc = %d.%d, Vpp = %d.%d\n",
+    printk(KERN_INFO "ide-cs: %s: Vcc = %d.%d, Vpp = %d.%d\n",
 	   info->node.dev_name, link->conf.Vcc/10, link->conf.Vcc%10,
 	   link->conf.Vpp1/10, link->conf.Vpp1%10);
 
@@ -409,9 +409,9 @@
 	MOD_DEC_USE_COUNT;
     }
 
-    request_region(link->io.BasePort1, link->io.NumPorts1,"ide_cs");
+    request_region(link->io.BasePort1, link->io.NumPorts1,"ide-cs");
     if (link->io.NumPorts2)
-	request_region(link->io.BasePort2, link->io.NumPorts2,"ide_cs");
+	request_region(link->io.BasePort2, link->io.NumPorts2,"ide-cs");
     
     info->ndev = 0;
     link->dev = NULL;
@@ -508,7 +508,7 @@
     DEBUG(0, "%s\n", version);
     CardServices(GetCardServicesInfo, &serv);
     if (serv.Revision != CS_RELEASE_CODE) {
-	printk(KERN_NOTICE "ide_cs: Card Services release "
+	printk(KERN_NOTICE "ide-cs: Card Services release "
 	       "does not match!\n");
 	return -1;
     }
@@ -518,7 +518,7 @@
 
 static void __exit exit_ide_cs(void)
 {
-    DEBUG(0, "ide_cs: unloading\n");
+    DEBUG(0, "ide-cs: unloading\n");
     unregister_pccard_driver(&dev_info);
     while (dev_list != NULL)
 	ide_detach(dev_list);