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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_g
/
prom.c
diff --git
a/arch/mips/momentum/ocelot_g/prom.c
b/arch/mips/momentum/ocelot_g/prom.c
index
6b4f577
..
2f75c6b
100644
(file)
--- a/
arch/mips/momentum/ocelot_g/prom.c
+++ b/
arch/mips/momentum/ocelot_g/prom.c
@@
-11,7
+11,6
@@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/sched.h>
@@
-29,7
+28,7
@@
struct callvectors* debug_vectors;
extern unsigned long marvell_base;
extern unsigned long bus_clock;
extern unsigned long marvell_base;
extern unsigned long bus_clock;
-#ifdef CONFIG_GALIL
L
EO_GT64240_ETH
+#ifdef CONFIG_GALILEO_GT64240_ETH
extern unsigned char prom_mac_addr_base[6];
#endif
extern unsigned char prom_mac_addr_base[6];
#endif
@@
-62,7
+61,7
@@
void __init prom_init(void)
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_G;
mips_machgroup = MACH_GROUP_MOMENCO;
mips_machtype = MACH_MOMENCO_OCELOT_G;
-#ifdef CONFIG_GALIL
L
EO_GT64240_ETH
+#ifdef CONFIG_GALILEO_GT64240_ETH
/* get the base MAC address for on-board ethernet ports */
memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6);
#endif
/* get the base MAC address for on-board ethernet ports */
memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6);
#endif