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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
board-sam9-l9260.c
diff --git
a/arch/arm/mach-at91/board-sam9-l9260.c
b/arch/arm/mach-at91/board-sam9-l9260.c
index b4834697753499278b85aea36c710d990dd9ce49..25a26beaa728bbee99a15174925a73532ddad949 100644
(file)
--- a/
arch/arm/mach-at91/board-sam9-l9260.c
+++ b/
arch/arm/mach-at91/board-sam9-l9260.c
@@
-212,8
+212,6
@@
static void __init ek_board_init(void)
MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")
/* Maintainer: Olimex */
- .phys_io = AT91_BASE_SYS,
- .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
.boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91sam926x_timer,
.map_io = ek_map_io,