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' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
alchemy
/
devboards
/
pb1100
/
board_setup.c
diff --git
a/arch/mips/alchemy/devboards/pb1100/board_setup.c
b/arch/mips/alchemy/devboards/pb1100/board_setup.c
index c7b4caa81a356804f72cc70b64d230b6acb8187a..90dda5f3ecc50fad0344b3aadfaa00b2473d037e 100644
(file)
--- a/
arch/mips/alchemy/devboards/pb1100/board_setup.c
+++ b/
arch/mips/alchemy/devboards/pb1100/board_setup.c
@@
-39,11
+39,6
@@
const char *get_system_type(void)
return "Alchemy Pb1100";
}
-void board_reset(void)
-{
- bcsr_write(BCSR_SYSTEM, 0);
-}
-
void __init board_setup(void)
{
volatile void __iomem *base = (volatile void __iomem *)0xac000000UL;