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-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
flash.h
diff --git
a/arch/arm/plat-omap/include/plat/flash.h
b/arch/arm/plat-omap/include/plat/flash.h
index
3e63270
..
3083195
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/flash.h
+++ b/
arch/arm/plat-omap/include/plat/flash.h
@@
-11,6
+11,6
@@
#include <linux/mtd/map.h>
#include <linux/mtd/map.h>
-extern void omap1_set_vpp(struct
map_info *map
, int enable);
+extern void omap1_set_vpp(struct
platform_device *pdev
, int enable);
#endif
#endif