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/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-flash.h
diff --git
a/arch/arm/mach-omap2/board-flash.h
b/arch/arm/mach-omap2/board-flash.h
index
69befe0
..
c240a3f
100644
(file)
--- a/
arch/arm/mach-omap2/board-flash.h
+++ b/
arch/arm/mach-omap2/board-flash.h
@@
-25,6
+25,6
@@
struct flash_partitions {
};
extern void board_flash_init(struct flash_partitions [],
};
extern void board_flash_init(struct flash_partitions [],
- char chip_sel[][GPMC_CS_NUM]);
+ char chip_sel[][GPMC_CS_NUM]
, int nand_type
);
extern void board_nand_init(struct mtd_partition *nand_parts,
extern void board_nand_init(struct mtd_partition *nand_parts,
- u8 nr_parts, u8 cs);
+ u8 nr_parts, u8 cs
, int nand_type
);