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.infradead.org/mtd-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
board-sam9263ek.c
diff --git
a/arch/arm/mach-at91/board-sam9263ek.c
b/arch/arm/mach-at91/board-sam9263ek.c
index f57458559fb66da229df4273f2aebf56f79739dd..c164c8e58ae6a037cdfbbf4b9b5a9842b9b094e2 100644
(file)
--- a/
arch/arm/mach-at91/board-sam9263ek.c
+++ b/
arch/arm/mach-at91/board-sam9263ek.c
@@
-180,7
+180,7
@@
static struct mtd_partition __initdata ek_nand_partition[] = {
},
};
-static struct mtd_partition *nand_partitions(int size, int *num_partitions)
+static struct mtd_partition *
__init
nand_partitions(int size, int *num_partitions)
{
*num_partitions = ARRAY_SIZE(ek_nand_partition);
return ek_nand_partition;