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/gerg/m68knommu
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
nor-simtec.c
diff --git
a/arch/arm/mach-s3c2410/nor-simtec.c
b/arch/arm/mach-s3c2410/nor-simtec.c
index
598d130
..
ad9f750
100644
(file)
--- a/
arch/arm/mach-s3c2410/nor-simtec.c
+++ b/
arch/arm/mach-s3c2410/nor-simtec.c
@@
-32,7
+32,7
@@
#include "nor-simtec.h"
-static void simtec_nor_vpp(struct
map_info *map
, int vpp)
+static void simtec_nor_vpp(struct
platform_device *pdev
, int vpp)
{
unsigned int val;
unsigned long flags;