diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 19:46:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 19:46:08 -0400 |
| commit | 3e318b5b55fafebd3a6e4dd3a00b79bfc0668675 (patch) | |
| tree | e2be576d5ab3487d0c350b421bff7e285fd056c2 /arch/arm/mach-orion5x/rd88f5182-setup.c | |
| parent | 940389b8afad6495211614c13eb91ef7001773ec (diff) | |
| parent | 53cdb27a933e4032934cbda0b447cfc9943c0eac (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix shared mmap when more than two maps of the same file exist
[ARM] fix VIPT/VIVT macro optimisations, add comments
[ARM] 5179/1: Replace obsolete IRQT_* and __IRQT_* values with IRQ_TYPE_*
[ARM] update defconfig for eseries.
[ARM] PXA: squash warning in pxafb
[ARM] pxa: PXA25x UDC - Fix warning during build
[ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26
[ARM] fix IOP32x, IOP33x, MXC and Samsung builds
[ARM] pci: provide dummy pci_get_legacy_ide_irq()
[ARM] fix fls() for 64-bit arguments
[ARM] fix mode for board-yl-9200.c
[ARM] 5176/1: arm/Makefile: fix: ARM946T -> ARM946E
Diffstat (limited to 'arch/arm/mach-orion5x/rd88f5182-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f5182-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 10ae62864269..2a46d27209c1 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c | |||
| @@ -148,7 +148,7 @@ void __init rd88f5182_pci_preinit(void) | |||
| 148 | pin = RD88F5182_PCI_SLOT0_IRQ_A_PIN; | 148 | pin = RD88F5182_PCI_SLOT0_IRQ_A_PIN; |
| 149 | if (gpio_request(pin, "PCI IntA") == 0) { | 149 | if (gpio_request(pin, "PCI IntA") == 0) { |
| 150 | if (gpio_direction_input(pin) == 0) { | 150 | if (gpio_direction_input(pin) == 0) { |
| 151 | set_irq_type(gpio_to_irq(pin), IRQT_LOW); | 151 | set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); |
| 152 | } else { | 152 | } else { |
| 153 | printk(KERN_ERR "rd88f5182_pci_preinit faield to " | 153 | printk(KERN_ERR "rd88f5182_pci_preinit faield to " |
| 154 | "set_irq_type pin %d\n", pin); | 154 | "set_irq_type pin %d\n", pin); |
| @@ -161,7 +161,7 @@ void __init rd88f5182_pci_preinit(void) | |||
| 161 | pin = RD88F5182_PCI_SLOT0_IRQ_B_PIN; | 161 | pin = RD88F5182_PCI_SLOT0_IRQ_B_PIN; |
| 162 | if (gpio_request(pin, "PCI IntB") == 0) { | 162 | if (gpio_request(pin, "PCI IntB") == 0) { |
| 163 | if (gpio_direction_input(pin) == 0) { | 163 | if (gpio_direction_input(pin) == 0) { |
| 164 | set_irq_type(gpio_to_irq(pin), IRQT_LOW); | 164 | set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW); |
| 165 | } else { | 165 | } else { |
| 166 | printk(KERN_ERR "rd88f5182_pci_preinit faield to " | 166 | printk(KERN_ERR "rd88f5182_pci_preinit faield to " |
| 167 | "set_irq_type pin %d\n", pin); | 167 | "set_irq_type pin %d\n", pin); |