projects
/
firefly-linux-kernel-4.4.55.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...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
pci
/
ce4100.c
diff --git
a/arch/x86/pci/ce4100.c
b/arch/x86/pci/ce4100.c
index c63c6d3dd8e81e7d7dabf4309308fe63d0d39b37..67858be4b52b8066201cd5f5cfda657806476e32 100644
(file)
--- 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 <linux/pci.h>
#include <linux/init.h>
+#include <asm/ce4100.h>
#include <asm/pci_x86.h>
struct sim_reg {
#include <asm/pci_x86.h>
struct sim_reg {
@@
-306,10
+307,10
@@
struct pci_raw_ops ce4100_pci_conf = {
.write = ce4100_conf_write,
};
.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;
{
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);