summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/files/arch/mips/pci
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-29 07:36:43 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-29 07:36:43 +0000
commite96d52d198511789d66d8fb7bd9a0f3c3c9c0107 (patch)
treea91c5c6dbd1ccf52974ba5063918e1c171ebeb1a /target/linux/adm5120/files/arch/mips/pci
parent19be4923e0a2dfa6dd173288fc0ead976a0f2b38 (diff)
downloadmaster-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.gz
master-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.bz2
master-31e0f0ae-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.zip
adm5120: merge 3.3 patches
SVN-Revision: 31511
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 86657ce841..f8d359806a 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);
/* -------------------------------------------------------------------------*/