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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-dk.c
diff --git
a/arch/arm/mach-at91/board-dk.c
b/arch/arm/mach-at91/board-dk.c
index
dab958d
..
02a70b2
100644
(file)
--- a/
arch/arm/mach-at91/board-dk.c
+++ b/
arch/arm/mach-at91/board-dk.c
@@
-147,7
+147,7
@@
static struct mtd_partition * __init nand_partitions(int size, int *num_partitio
return dk_nand_partition;
}
-static struct at
91
_nand_data __initdata dk_nand_data = {
+static struct at
mel
_nand_data __initdata dk_nand_data = {
.ale = 22,
.cle = 21,
.det_pin = AT91_PIN_PB1,