git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
au1000
/
common
/
prom.c
diff --git
a/arch/mips/au1000/common/prom.c
b/arch/mips/au1000/common/prom.c
index
90d7069
..
18b310b
100644
(file)
--- a/
arch/mips/au1000/common/prom.c
+++ b/
arch/mips/au1000/common/prom.c
@@
-3,9
+3,8
@@
* BRIEF MODULE DESCRIPTION
* PROM library initialisation code, supports YAMON and U-Boot.
*
* BRIEF MODULE DESCRIPTION
* PROM library initialisation code, supports YAMON and U-Boot.
*
- * Copyright 2000, 2001, 2006 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- * ppopov@mvista.com or source@mvista.com
+ * Copyright 2000-2001, 2006, 2008 MontaVista Software Inc.
+ * Author: MontaVista Software, Inc. <source@mvista.com>
*
* This file was derived from Carsten Langgaard's
* arch/mips/mips-boards/xx files.
*
* This file was derived from Carsten Langgaard's
* arch/mips/mips-boards/xx files.
@@
-33,8
+32,8
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/string.h>
@@
-57,7
+56,7
@@
void prom_init_cmdline(void)
actr = 1; /* Always ignore argv[0] */
cp = &(arcs_cmdline[0]);
actr = 1; /* Always ignore argv[0] */
cp = &(arcs_cmdline[0]);
- while(actr < prom_argc) {
+ while
(actr < prom_argc) {
strcpy(cp, prom_argv[actr]);
cp += strlen(prom_argv[actr]);
*cp++ = ' ';
strcpy(cp, prom_argv[actr]);
cp += strlen(prom_argv[actr]);
*cp++ = ' ';
@@
-84,10
+83,8
@@
char *prom_getenv(char *envname)
if (yamon) {
if (strcmp(envname, *env++) == 0)
return *env;
if (yamon) {
if (strcmp(envname, *env++) == 0)
return *env;
- } else {
- if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
- return *env + i + 1;
- }
+ } else if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
+ return *env + i + 1;
env++;
}
env++;
}
@@
-110,13
+107,13
@@
static inline void str2eaddr(unsigned char *ea, unsigned char *str)
{
int i;
{
int i;
- for(i = 0; i < 6; i++) {
+ for
(i = 0; i < 6; i++) {
unsigned char num;
unsigned char num;
- if((*str == '.') || (*str == ':'))
+ if
((*str == '.') || (*str == ':'))
str++;
str++;
- num = str2hexnum(*str++) << 4;
- num |=
(str2hexnum(*str++)
);
+ num
= str2hexnum(*str++) << 4;
+ num |=
str2hexnum(*str++
);
ea[i] = num;
}
}
ea[i] = num;
}
}