git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_c
/
prom.c
diff --git
a/arch/mips/momentum/ocelot_c/prom.c
b/arch/mips/momentum/ocelot_c/prom.c
index
7621129
..
49ac302
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/prom.c
+++ b/
arch/mips/momentum/ocelot_c/prom.c
@@
-32,7
+32,7
@@
struct callvectors* debug_vectors;
extern unsigned long marvell_base;
extern unsigned long cpu_clock;
extern unsigned long marvell_base;
extern unsigned long cpu_clock;
-#ifdef CONFIG_MV643
40
_ETH
+#ifdef CONFIG_MV643
XX
_ETH
extern unsigned char prom_mac_addr_base[6];
#endif
extern unsigned char prom_mac_addr_base[6];
#endif
@@
-45,7
+45,7
@@
const char *get_system_type(void)
#endif
}
#endif
}
-#ifdef CONFIG_MV643
40
_ETH
+#ifdef CONFIG_MV643
XX
_ETH
static void burn_clocks(void)
{
int i;
static void burn_clocks(void)
{
int i;
@@
-227,7
+227,7
@@
void __init prom_init(void)
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_C;
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_C;
-#ifdef CONFIG_MV643
40
_ETH
+#ifdef CONFIG_MV643
XX
_ETH
/* get the base MAC address for on-board ethernet ports */
get_mac(prom_mac_addr_base);
#endif
/* get the base MAC address for on-board ethernet ports */
get_mac(prom_mac_addr_base);
#endif