First batch of PMC Ocelot CP7000 patches.

2 files changed, 14 insertions, 30 deletions

diff --git a/arch/mips/mips-boards/generic/cmdline.c b/arch/mips/mips-boards/generic/cmdline.c
index b14650f41..d88f2dac1 100644
--- a/arch/mips/mips-boards/generic/cmdline.c
+++ b/arch/mips/mips-boards/generic/cmdline.c
@@ -2,25 +2,20 @@
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
  *
- * ########################################################################
+ * This program is free software; you can distribute it and/or modify it
+ * under the terms of the GNU General Public License (Version 2) as
+ * published by the Free Software Foundation.
  *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
  *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * ########################################################################
- * 
  * Kernel command line creation using the prom monitor (YAMON) argc/argv.
- *
  */
 #include <linux/config.h>
 #include <linux/init.h>
@@ -28,8 +23,6 @@
 
 #include <asm/bootinfo.h>
 
-/* #define DEBUG_CMDLINE */
-
 extern int prom_argc;
 extern char **prom_argv;
 
@@ -58,8 +51,4 @@ void  __init prom_init_cmdline(void)
 	if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */
 		--cp;
 	*cp = '\0';
-
-#ifdef DEBUG_CMDLINE
-	prom_printf("prom_init_cmdline: %s\n", &(arcs_cmdline[0]));
-#endif
 }
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c
index f5b71c020..9f8b4dd27 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mips-boards/generic/init.c
@@ -2,8 +2,6 @@
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
  *
- * ########################################################################
- *
  *  This program is free software; you can distribute it and/or modify it
  *  under the terms of the GNU General Public License (Version 2) as
  *  published by the Free Software Foundation.
@@ -17,8 +15,6 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
  *
- * ########################################################################
- *
  * PROM library initialisation code.
  */
 #include <linux/config.h>
@@ -31,9 +27,9 @@
 /* Environment variable */
 typedef struct
 {
-    char *name;
-    char *val;
-}t_env_var;
+	char *name;
+	char *val;
+} t_env_var;
 
 int prom_argc;
 char **prom_argv, **prom_envp;
@@ -95,8 +91,7 @@ int get_ethernet_addr(char *ethernet_addr)
 	}
 	str2eaddr(ethernet_addr, ethaddr_str);
 
-	if (init_debug > 1)
-	{
+	if (init_debug > 1) {
 	        int i;
 		printk("get_ethernet_addr: ");
 	        for (i=0; i<5; i++)