git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
xen
/
pcifront.h
diff --git
a/include/xen/pcifront.h
b/include/xen/pcifront.h
index
17c843a
..
50d76fe
100644
(file)
--- a/
include/xen/pcifront.h
+++ b/
include/xen/pcifront.h
@@
-6,7
+6,6
@@
#ifndef __XEN_ASM_PCIFRONT_H__
#define __XEN_ASM_PCIFRONT_H__
#ifndef __XEN_ASM_PCIFRONT_H__
#define __XEN_ASM_PCIFRONT_H__
-#include <linux/config.h>
#include <linux/spinlock.h>
#ifdef __KERNEL__
#include <linux/spinlock.h>
#ifdef __KERNEL__
@@
-70,7
+69,7
@@
static inline void pcifront_init_sd(struct pcifront_sd *sd, int domain,
#endif /* __ia64__ */
#endif /* __ia64__ */
-extern s
pinlock_t pci_bus_lock
;
+extern s
truct rw_semaphore pci_bus_sem
;
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */