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 'pci-for-jesse' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
io.c
diff --git
a/arch/arm/mach-omap2/io.c
b/arch/arm/mach-omap2/io.c
index
5a4091f
..
987351f
100644
(file)
--- a/
arch/arm/mach-omap2/io.c
+++ b/
arch/arm/mach-omap2/io.c
@@
-21,8
+21,8
@@
#include <asm/mach/map.h>
#include <asm/mach/map.h>
-#include <
asm/ar
ch/mux.h>
-#include <
asm/ar
ch/omapfb.h>
+#include <
ma
ch/mux.h>
+#include <
ma
ch/omapfb.h>
extern void omap_sram_init(void);
extern int omap2_clk_init(void);
extern void omap_sram_init(void);
extern int omap2_clk_init(void);
@@
-42,6
+42,12
@@
static struct map_desc omap2_io_desc[] __initdata = {
.length = L3_24XX_SIZE,
.type = MT_DEVICE
},
.length = L3_24XX_SIZE,
.type = MT_DEVICE
},
+ {
+ .virtual = L4_24XX_VIRT,
+ .pfn = __phys_to_pfn(L4_24XX_PHYS),
+ .length = L4_24XX_SIZE,
+ .type = MT_DEVICE
+ },
#ifdef CONFIG_ARCH_OMAP2430
{
.virtual = L4_WK_243X_VIRT,
#ifdef CONFIG_ARCH_OMAP2430
{
.virtual = L4_WK_243X_VIRT,