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 'topic/lola' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
terastation_pro2-setup.c
diff --git
a/arch/arm/mach-orion5x/terastation_pro2-setup.c
b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index
5653ee6
..
6160041
100644
(file)
--- a/
arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/
arch/arm/mach-orion5x/terastation_pro2-setup.c
@@
-88,7
+88,7
@@
void __init tsp2_pci_preinit(void)
pin = TSP2_PCI_SLOT0_IRQ_PIN;
if (gpio_request(pin, "PCI Int1") == 0) {
if (gpio_direction_input(pin) == 0) {
pin = TSP2_PCI_SLOT0_IRQ_PIN;
if (gpio_request(pin, "PCI Int1") == 0) {
if (gpio_direction_input(pin) == 0) {
- set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
+
irq_
set_irq_type(gpio_to_irq(pin), IRQ_TYPE_LEVEL_LOW);
} else {
printk(KERN_ERR "tsp2_pci_preinit failed "
"to set_irq_type pin %d\n", pin);
} else {
printk(KERN_ERR "tsp2_pci_preinit failed "
"to set_irq_type pin %d\n", pin);