Merge with Linux 2.3.99-pre4.

1 files changed, 1 insertions, 32 deletions

diff --git a/drivers/char/pcwd.c b/drivers/char/pcwd.c
index c5b0e54ba..2e2d391fa 100644
--- a/drivers/char/pcwd.c
+++ b/drivers/char/pcwd.c
@@ -39,6 +39,7 @@
  * 990605	Made changes to code to support Firmware 1.22a, added
  *		fairly useless proc entry.
  * 990610	removed said useless proc code for the merge <alan>
+ * 000403	Removed last traces of proc code. <davej>
  */
 
 #include <linux/module.h>
@@ -541,38 +542,6 @@ static void debug_off(void)
 	mode_debug = 0;
 }
 
-static int pcwd_proc_get_info(char *buffer, char **start, off_t offset,
-	int length, int inout)
-{
-	int len;
-	off_t begin = 0;
-	
-	revision = get_revision();
-	len = sprintf(buffer, "Version = " WD_VER "\n");
-	
-	if (revision == PCWD_REVISION_A)
-		len += sprintf(buffer + len, "Revision = A\n");
-	else
-		len += sprintf(buffer + len, "Revision = C\n");
-	
-	if (supports_temp) {
-		unsigned short c = inb(current_readport);
-		
-		len += sprintf(buffer + len, "Temp = Yes\n"
-			"Current temp = %d (Celsius)\n",
-			c);
-	} else
-		len += sprintf(buffer + len, "Temp = No\n");
-	
-	*start = buffer + (offset);
-	len -= offset;
-
-	if (len > length)
-		len = length;
-	
-	return len;
-}
-
 static struct file_operations pcwd_fops = {
 	read:		pcwd_read,
 	write:		pcwd_write,