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/mason/btrfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
magician.c
diff --git
a/arch/arm/mach-pxa/magician.c
b/arch/arm/mach-pxa/magician.c
index
9984ef7
..
e192057
100644
(file)
--- a/
arch/arm/mach-pxa/magician.c
+++ b/
arch/arm/mach-pxa/magician.c
@@
-662,7
+662,7
@@
static struct pxaohci_platform_data magician_ohci_info = {
* StrataFlash
*/
* StrataFlash
*/
-static void magician_set_vpp(struct
map_info *map
, int vpp)
+static void magician_set_vpp(struct
platform_device *pdev
, int vpp)
{
gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp);
}
{
gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp);
}