projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
topology.h
diff --git
a/arch/x86/include/asm/topology.h
b/arch/x86/include/asm/topology.h
index
800f77c
..
b9676ae
100644
(file)
--- a/
arch/x86/include/asm/topology.h
+++ b/
arch/x86/include/asm/topology.h
@@
-172,7
+172,7
@@
static inline void arch_fix_phys_package_id(int num, u32 slot)
}
struct pci_bus;
-void x86_pci_root_bus_res
_quirks(struct pci_bus *b
);
+void x86_pci_root_bus_res
ources(int bus, struct list_head *resources
);
#ifdef CONFIG_SMP
#define mc_capable() ((boot_cpu_data.x86_max_cores > 1) && \