diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/pci/ops-pmcmsp.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/pci/ops-pmcmsp.c')
| -rw-r--r-- | arch/mips/pci/ops-pmcmsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index 32548b5d68d6..04b31478a6d7 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c | |||
| @@ -206,7 +206,7 @@ static void pci_proc_init(void) | |||
| 206 | } | 206 | } |
| 207 | #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ | 207 | #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ |
| 208 | 208 | ||
| 209 | DEFINE_SPINLOCK(bpci_lock); | 209 | static DEFINE_SPINLOCK(bpci_lock); |
| 210 | 210 | ||
| 211 | /***************************************************************************** | 211 | /***************************************************************************** |
| 212 | * | 212 | * |