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 remote-tracking branch 'agust/next' into merge
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-snapper9260.c
diff --git
a/arch/arm/mach-at91/board-snapper9260.c
b/arch/arm/mach-at91/board-snapper9260.c
index
c73d25e
..
0df01c6
100644
(file)
--- a/
arch/arm/mach-at91/board-snapper9260.c
+++ b/
arch/arm/mach-at91/board-snapper9260.c
@@
-97,18
+97,12
@@
static struct mtd_partition __initdata snapper9260_nand_partitions[] = {
},
};
},
};
-static struct mtd_partition * __init
-snapper9260_nand_partition_info(int size, int *num_partitions)
-{
- *num_partitions = ARRAY_SIZE(snapper9260_nand_partitions);
- return snapper9260_nand_partitions;
-}
-
static struct atmel_nand_data __initdata snapper9260_nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
static struct atmel_nand_data __initdata snapper9260_nand_data = {
.ale = 21,
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
- .partition_info = snapper9260_nand_partition_info,
+ .parts = snapper9260_nand_partitions,
+ .num_parts = ARRAY_SIZE(snapper9260_nand_partitions),
.bus_width_16 = 0,
};
.bus_width_16 = 0,
};