--- linux/drivers/ide/ide-cs.c	2004-11-15 22:31:07.000000000 -0800
+++ linux/drivers/ide/ide-cs.c.new	2005-03-01 22:07:52.334266784 -0800
@@ -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
@@ -68,7 +68,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
@@ -113,7 +113,7 @@
 		     event_callback_args_t *args);
 
 #ifdef CONFIG_ARCH_SHARP_SL
-static dev_info_t dev_info = "ide_cs";
+static dev_info_t dev_info = "ide-cs";
 #else
 static dev_info_t dev_info = "ide-cs";
 #endif
@@ -379,7 +379,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;
@@ -392,7 +392,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);
 
@@ -434,10 +434,10 @@
 
 #ifdef CONFIG_ARCH_SHARP_SL
     request_region(link->io.BasePort1,
-		   link->io.NumPorts1 << PCMCIA_ADDRESS_SHIFT,"ide_cs");
+		   link->io.NumPorts1 << PCMCIA_ADDRESS_SHIFT,"ide-cs");
     if (link->io.NumPorts2)
 	request_region(link->io.BasePort2,
-		       link->io.NumPorts2 << PCMCIA_ADDRESS_SHIFT,"ide_cs");
+		       link->io.NumPorts2 << PCMCIA_ADDRESS_SHIFT,"ide-cs");
 #else
     request_region(link->io.BasePort1,
 		   link->io.NumPorts1 << PCMCIA_ADDRESS_SHIFT,"ide-cs");
@@ -556,7 +556,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;
     }
@@ -566,7 +566,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);