git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
pci_x86.h
diff --git
a/arch/x86/include/asm/pci_x86.h
b/arch/x86/include/asm/pci_x86.h
index ff5404b82fdc5231b097e4b9b97b3a016bf0269d..cd2a31dc5fb8e4a956c8c34125534540d51b08f4 100644
(file)
--- a/
arch/x86/include/asm/pci_x86.h
+++ b/
arch/x86/include/asm/pci_x86.h
@@
-85,7
+85,7
@@
struct irq_routing_table {
extern unsigned int pcibios_irq_mask;
-extern spinlock_t pci_config_lock;
+extern
raw_
spinlock_t pci_config_lock;
extern int (*pcibios_enable_irq)(struct pci_dev *dev);
extern void (*pcibios_disable_irq)(struct pci_dev *dev);