summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/arch/mips/pci
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-29 07:36:43 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-29 07:36:43 +0000
commit0c3e51f31ceb672b391aa4b4086ab5e0edf07fc1 (patch)
tree15e272500401e7847d9ea7dc40a0fafb81f93c1d /target/linux/adm5120/files/arch/mips/pci
parent71b94eaba41e5b7d038d3ad09a404316d9430ae5 (diff)
adm5120: merge 3.3 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/arch/mips/pci')
-rw-r--r--target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
index 86657ce84..f8d359806 100644
--- a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
+++ b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
@@ -49,7 +49,7 @@
static unsigned int adm5120_pci_nr_irqs __initdata;
static struct adm5120_pci_irq *adm5120_pci_irq_map __initdata;
-static spinlock_t pci_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pci_lock);
/* -------------------------------------------------------------------------*/