[LV-k25-commit] kernel-2.5/drivers/vax/serial ipr.c,1.10,1.11

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/serial
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10539/drivers/vax/serial

Modified Files:
	ipr.c 
Log Message:
Fix a static-follows-non-static error with GCC 4.1


Index: ipr.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/serial/ipr.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ipr.c	25 Apr 2005 22:25:07 -0000	1.10
+++ ipr.c	8 May 2005 22:56:13 -0000	1.11
@@ -353,6 +353,15 @@
 	.type		= PORT_VAX_IPR,
 };
 
+static struct uart_driver iprcons_uart_driver = {
+	.owner		= THIS_MODULE,
+	.driver_name	= "ttyS",
+	.dev_name	= "ttyS",
+	.major		= SERIAL_VAX_IPR_MAJOR,
+	.minor		= SERIAL_VAX_IPR_MINOR,
+	.nr		= 1,
+};
+
 #ifdef CONFIG_SERIAL_CONSOLE
 
 static void iprcons_console_write(struct console *co, const char *p, unsigned int count)
@@ -404,13 +413,6 @@
 	__mtpr(old_inten_tx, PR_TXCS);
 }
 
-/*
- * This is really just a forward declaration for the static struct
- * uart_driver defined below
- */
-
-extern struct uart_driver iprcons_uart_driver;
-
 static struct console iprcons_console = {
 	.name	= "ttyS",
 	.write	= iprcons_console_write,
@@ -421,29 +423,14 @@
 
 static int __init iprcons_console_init(void)
 {
+	iprcons_uart_driver.cons = &iprcons_console;
 	register_console(&iprcons_console);
 	return 0;
 }
 console_initcall(iprcons_console_init);
 
-#define VAX_IPR_CONSOLE	&iprcons_console
-
-#else /* CONFIG_SERIAL_CONSOLE */
-
-#define VAX_IPR_CONSOLE	NULL
-
 #endif /* CONFIG_SERIAL_CONSOLE */
 
-static struct uart_driver iprcons_uart_driver = {
-	.owner		= THIS_MODULE,
-	.driver_name	= "ttyS",
-	.dev_name	= "ttyS",
-	.major		= SERIAL_VAX_IPR_MAJOR,
-	.minor		= SERIAL_VAX_IPR_MINOR,
-	.nr		= 1,
-	.cons		= VAX_IPR_CONSOLE,
-};
-
 static void __exit iprcons_exit(void)
 {
 	/*