diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 02:39:47 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-31 02:39:47 -0400 |
| commit | 7ea5db8efeac8627500e012aa6829ca612c5a700 (patch) | |
| tree | 90e4de22f60b989dcf0f0d7436978c0b463d5827 /arch/arm/mach-ixp4xx/vulcan-pci.c | |
| parent | eee7631fdf8ae63c4f24daf66981ac1a7b55d7fd (diff) | |
| parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/arm/mach-ixp4xx/vulcan-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/vulcan-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/vulcan-pci.c b/arch/arm/mach-ixp4xx/vulcan-pci.c index f3111c6840ef..03bdec5140a7 100644 --- a/arch/arm/mach-ixp4xx/vulcan-pci.c +++ b/arch/arm/mach-ixp4xx/vulcan-pci.c | |||
| @@ -38,8 +38,8 @@ void __init vulcan_pci_preinit(void) | |||
| 38 | pr_info("Vulcan PCI: limiting CardBus memory size to %dMB\n", | 38 | pr_info("Vulcan PCI: limiting CardBus memory size to %dMB\n", |
| 39 | (int)(pci_cardbus_mem_size >> 20)); | 39 | (int)(pci_cardbus_mem_size >> 20)); |
| 40 | #endif | 40 | #endif |
| 41 | set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW); | 41 | irq_set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW); |
| 42 | set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW); | 42 | irq_set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW); |
| 43 | ixp4xx_pci_preinit(); | 43 | ixp4xx_pci_preinit(); |
| 44 | } | 44 | } |
| 45 | 45 | ||