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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp23xx
/
roadrunner.c
diff --git
a/arch/arm/mach-ixp23xx/roadrunner.c
b/arch/arm/mach-ixp23xx/roadrunner.c
index
f0f70ba
..
76c61ba
100644
(file)
--- a/
arch/arm/mach-ixp23xx/roadrunner.c
+++ b/
arch/arm/mach-ixp23xx/roadrunner.c
@@
-33,7
+33,7
@@
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/memory.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <asm/system.h>
@@
-110,8
+110,8
@@
static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
static void __init roadrunner_pci_preinit(void)
{
static void __init roadrunner_pci_preinit(void)
{
- set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ
T
_LOW);
- set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ
T
_LOW);
+ set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQ
_TYPE_LEVEL
_LOW);
+ set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQ
_TYPE_LEVEL
_LOW);
ixp23xx_pci_preinit();
}
ixp23xx_pci_preinit();
}
@@
-171,8
+171,6
@@
static void __init roadrunner_init(void)
MACHINE_START(ROADRUNNER, "ADI Engineering RoadRunner Development Platform")
/* Maintainer: Deepak Saxena */
MACHINE_START(ROADRUNNER, "ADI Engineering RoadRunner Development Platform")
/* Maintainer: Deepak Saxena */
- .phys_io = IXP23XX_PERIPHERAL_PHYS,
- .io_pg_offst = ((IXP23XX_PERIPHERAL_VIRT >> 18)) & 0xfffc,
.map_io = ixp23xx_map_io,
.init_irq = ixp23xx_init_irq,
.timer = &ixp23xx_timer,
.map_io = ixp23xx_map_io,
.init_irq = ixp23xx_init_irq,
.timer = &ixp23xx_timer,