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-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-pcm038.c
diff --git
a/arch/arm/mach-imx/mach-pcm038.c
b/arch/arm/mach-imx/mach-pcm038.c
index
b9888a8
..
49a97ce
100644
(file)
--- a/
arch/arm/mach-imx/mach-pcm038.c
+++ b/
arch/arm/mach-imx/mach-pcm038.c
@@
-342,8
+342,6
@@
static struct sys_timer pcm038_timer = {
};
MACHINE_START(PCM038, "phyCORE-i.MX27")
};
MACHINE_START(PCM038, "phyCORE-i.MX27")
- .phys_io = MX27_AIPI_BASE_ADDR,
- .io_pg_offst = ((MX27_AIPI_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.boot_params = MX27_PHYS_OFFSET + 0x100,
.map_io = mx27_map_io,
.init_irq = mx27_init_irq,
.boot_params = MX27_PHYS_OFFSET + 0x100,
.map_io = mx27_map_io,
.init_irq = mx27_init_irq,