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 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mach-kzm_arm11_01.c
diff --git
a/arch/arm/mach-mx3/mach-kzm_arm11_01.c
b/arch/arm/mach-mx3/mach-kzm_arm11_01.c
index
042cd56
..
a5f3eb2
100644
(file)
--- a/
arch/arm/mach-mx3/mach-kzm_arm11_01.c
+++ b/
arch/arm/mach-mx3/mach-kzm_arm11_01.c
@@
-41,9
+41,9
@@
#include "devices-imx31.h"
#include "devices.h"
#include "devices-imx31.h"
#include "devices.h"
-#define KZM_ARM11_IO_ADDRESS(x) ( \
- IMX_IO_
ADDRESS(x, MX31_CS4) ?:
\
- IMX_IO_
ADDRESS(x, MX31_CS5) ?:
\
+#define KZM_ARM11_IO_ADDRESS(x) (
IOMEM(
\
+ IMX_IO_
P2V_MODULE(x, MX31_CS4) ?:
\
+ IMX_IO_
P2V_MODULE(x, MX31_CS5)) ?:
\
MX31_IO_ADDRESS(x))
/*
MX31_IO_ADDRESS(x))
/*