diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
| commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
| tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-ixp4xx/wg302v2-pci.c | |
| parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-ixp4xx/wg302v2-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/wg302v2-pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c index 6588f2c758e2..9b59ed03b151 100644 --- a/arch/arm/mach-ixp4xx/wg302v2-pci.c +++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c | |||
| @@ -23,14 +23,14 @@ | |||
| 23 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
| 24 | 24 | ||
| 25 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
| 26 | #include <asm/hardware.h> | 26 | #include <mach/hardware.h> |
| 27 | 27 | ||
| 28 | #include <asm/mach/pci.h> | 28 | #include <asm/mach/pci.h> |
| 29 | 29 | ||
| 30 | void __init wg302v2_pci_preinit(void) | 30 | void __init wg302v2_pci_preinit(void) |
| 31 | { | 31 | { |
| 32 | set_irq_type(IRQ_IXP4XX_GPIO8, IRQT_LOW); | 32 | set_irq_type(IRQ_IXP4XX_GPIO8, IRQ_TYPE_LEVEL_LOW); |
| 33 | set_irq_type(IRQ_IXP4XX_GPIO9, IRQT_LOW); | 33 | set_irq_type(IRQ_IXP4XX_GPIO9, IRQ_TYPE_LEVEL_LOW); |
| 34 | 34 | ||
| 35 | ixp4xx_pci_preinit(); | 35 | ixp4xx_pci_preinit(); |
| 36 | } | 36 | } |