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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
arch
/
mips
/
lasat
/
lasat_board.c
diff --git
a/arch/mips/lasat/lasat_board.c
b/arch/mips/lasat/lasat_board.c
index
31e328b
..
577bb46
100644
(file)
--- a/
arch/mips/lasat/lasat_board.c
+++ b/
arch/mips/lasat/lasat_board.c
@@
-24,7
+24,6
@@
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/mutex.h>
#include <linux/string.h>
#include <linux/ctype.h>
#include <linux/mutex.h>
-#include <asm/bootinfo.h>
#include <asm/addrspace.h>
#include "at93c.h"
/* New model description table */
#include <asm/addrspace.h>
#include "at93c.h"
/* New model description table */
@@
-66,7
+65,7
@@
static void init_flash_sizes(void)
ls[LASAT_MTD_SERVICE] = 0xC0000;
ls[LASAT_MTD_NORMAL] = 0x100000;
ls[LASAT_MTD_SERVICE] = 0xC0000;
ls[LASAT_MTD_NORMAL] = 0x100000;
- if (
mips_machtype == MACH_LASAT_100
) {
+ if (
!IS_LASAT_200()
) {
lasat_board_info.li_flash_base = 0x1e000000;
lb[LASAT_MTD_BOOTLOADER] = 0x1e400000;
lasat_board_info.li_flash_base = 0x1e000000;
lb[LASAT_MTD_BOOTLOADER] = 0x1e400000;