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 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
sni
/
setup.c
diff --git
a/arch/mips/sni/setup.c
b/arch/mips/sni/setup.c
index
5484e1c
..
a49272c
100644
(file)
--- a/
arch/mips/sni/setup.c
+++ b/
arch/mips/sni/setup.c
@@
-116,7
+116,6
@@
void __init plat_mem_setup(void)
/*
* Setup (E)ISA I/O memory access stuff
*/
/*
* Setup (E)ISA I/O memory access stuff
*/
- isa_slot_offset = CKSEG1ADDR(0xb0000000);
#ifdef CONFIG_EISA
EISA_bus = 1;
#endif
#ifdef CONFIG_EISA
EISA_bus = 1;
#endif