diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 22:19:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-14 22:19:09 (GMT) |
| commit | 869c34f5208adde010065c387354f2ebe4ec3bfc (patch) | |
| tree | 6c427732d93fbb7357b68747bbbc182ba3b1fe9b /arch/x86/pci/ce4100.c | |
| parent | 52d3c03675fdbe1965b9b1909072b40ad2f80063 (diff) | |
| parent | 03150171dcf9492a96f57cbb2aef088bafcfcd2e (diff) | |
| download | linux-869c34f5208adde010065c387354f2ebe4ec3bfc.tar.xz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: ce4100: Set pci ops via callback instead of module init
x86/mm: Fix pgd_lock deadlock
x86/mm: Handle mm_fault_error() in kernel space
x86: Don't check for BIOS corruption in first 64K when there's no need to
Diffstat (limited to 'arch/x86/pci/ce4100.c')
| -rw-r--r-- | arch/x86/pci/ce4100.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/pci/ce4100.c b/arch/x86/pci/ce4100.c index 85b68ef..9260b3e 100644 --- a/arch/x86/pci/ce4100.c +++ b/arch/x86/pci/ce4100.c @@ -34,6 +34,7 @@ #include <linux/pci.h> #include <linux/init.h> +#include <asm/ce4100.h> #include <asm/pci_x86.h> struct sim_reg { @@ -306,10 +307,10 @@ struct pci_raw_ops ce4100_pci_conf = { .write = ce4100_conf_write, }; -static int __init ce4100_pci_init(void) +int __init ce4100_pci_init(void) { init_sim_regs(); raw_pci_ops = &ce4100_pci_conf; - return 0; + /* Indicate caller that it should invoke pci_legacy_init() */ + return 1; } -subsys_initcall(ce4100_pci_init); |