projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
[linux-2.6-block.git]
/
arch
/
arm
/
mach-at91
/
board-sam9rlek.c
diff --git
a/arch/arm/mach-at91/board-sam9rlek.c
b/arch/arm/mach-at91/board-sam9rlek.c
index b6a70fc735c38b602d47556e1d9d41ea0ce5140c..66e77bb2e079c4ad9592ed1d6dc347159fa079e8 100644
(file)
--- a/
arch/arm/mach-at91/board-sam9rlek.c
+++ b/
arch/arm/mach-at91/board-sam9rlek.c
@@
-96,7
+96,7
@@
static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return ek_nand_partition;
}
-static struct at
91
_nand_data __initdata ek_nand_data = {
+static struct at
mel
_nand_data __initdata ek_nand_data = {
.ale = 21,
.cle = 22,
// .det_pin = ... not connected