git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
pci
/
common.c
diff --git
a/arch/x86/pci/common.c
b/arch/x86/pci/common.c
index
3736176
..
cf2e938
100644
(file)
--- a/
arch/x86/pci/common.c
+++ b/
arch/x86/pci/common.c
@@
-9,6
+9,7
@@
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/dmi.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/dmi.h>
+#include <linux/slab.h>
#include <asm/acpi.h>
#include <asm/segment.h>
#include <asm/acpi.h>
#include <asm/segment.h>
@@
-71,12
+72,6
@@
struct pci_ops pci_root_ops = {
.write = pci_write,
};
.write = pci_write,
};
-/*
- * legacy, numa, and acpi all want to call pcibios_scan_root
- * from their initcalls. This flag prevents that.
- */
-int pcibios_scanned;
-
/*
* This interrupt-safe spinlock protects all accesses to PCI
* configuration space.
/*
* This interrupt-safe spinlock protects all accesses to PCI
* configuration space.