OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd
[uclinux-h8/linux.git]
/
arch
/
arm
/
mach-omap1
/
board-h2.c
diff --git
a/arch/arm/mach-omap1/board-h2.c
b/arch/arm/mach-omap1/board-h2.c
index
7e50368
..
a28e989
100644
(file)
--- a/
arch/arm/mach-omap1/board-h2.c
+++ b/
arch/arm/mach-omap1/board-h2.c
@@
-186,8
+186,6
@@
static int h2_nand_dev_ready(struct mtd_info *mtd)
return gpio_get_value(H2_NAND_RB_GPIO_PIN);
}
return gpio_get_value(H2_NAND_RB_GPIO_PIN);
}
-static const char *h2_part_probes[] = { "cmdlinepart", NULL };
-
static struct platform_nand_data h2_nand_platdata = {
.chip = {
.nr_chips = 1,
static struct platform_nand_data h2_nand_platdata = {
.chip = {
.nr_chips = 1,
@@
-195,7
+193,6
@@
static struct platform_nand_data h2_nand_platdata = {
.nr_partitions = ARRAY_SIZE(h2_nand_partitions),
.partitions = h2_nand_partitions,
.options = NAND_SAMSUNG_LP_OPTIONS,
.nr_partitions = ARRAY_SIZE(h2_nand_partitions),
.partitions = h2_nand_partitions,
.options = NAND_SAMSUNG_LP_OPTIONS,
- .part_probe_types = h2_part_probes,
},
.ctrl = {
.cmd_ctrl = omap1_nand_cmd_ctl,
},
.ctrl = {
.cmd_ctrl = omap1_nand_cmd_ctl,