git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
philips
/
pnx8550
/
jbs
/
init.c
diff --git
a/arch/mips/philips/pnx8550/jbs/init.c
b/arch/mips/philips/pnx8550/jbs/init.c
index 85f449174bc39c070e84d653a8ecf069aef5f927..cfd90fa3d799cef4b535d614a4cf2bf10c9ebfd3 100644
(file)
--- a/
arch/mips/philips/pnx8550/jbs/init.c
+++ b/
arch/mips/philips/pnx8550/jbs/init.c
@@
-48,7
+48,6
@@
void __init prom_init(void)
unsigned long memsize;
- mips_machgroup = MACH_GROUP_PHILIPS;
mips_machtype = MACH_PHILIPS_JBS;
//memsize = 0x02800000; /* Trimedia uses memory above */