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 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
x86_init.c
diff --git
a/arch/x86/kernel/x86_init.c
b/arch/x86/kernel/x86_init.c
index
75ef4b1
..
6f164bd
100644
(file)
--- a/
arch/x86/kernel/x86_init.c
+++ b/
arch/x86/kernel/x86_init.c
@@
-35,7
+35,7
@@
void iommu_shutdown_noop(void) { }
struct x86_init_ops x86_init __initdata = {
.resources = {
- .probe_roms =
x86_init_noop
,
+ .probe_roms =
probe_roms
,
.reserve_resources = reserve_standard_io_resources,
.memory_setup = default_machine_specific_memory_setup,
},