summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/pcic.h
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2011-04-17 13:49:55 +0200
committerDavid S. Miller <davem@davemloft.net>2011-04-19 22:11:39 -0700
commit06010fb588700e7fcb29e720c56884e3de5fd327 (patch)
tree832891d6ffcf8f2f762094c37b5e88a86bbdd007 /arch/sparc/include/asm/pcic.h
parentdb1cdd146a0814b6f312fe1a7fa1ab87ac177b2a (diff)
downloadop-kernel-dev-06010fb588700e7fcb29e720c56884e3de5fd327.zip
op-kernel-dev-06010fb588700e7fcb29e720c56884e3de5fd327.tar.gz
sparc32: cleanup code for pci init
Move the ifdeffery to a header file to make the logic more obvious where we decide between PCI or SBUS init Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/pcic.h')
-rw-r--r--arch/sparc/include/asm/pcic.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
index f20ef56..7eb5d78 100644
--- a/arch/sparc/include/asm/pcic.h
+++ b/arch/sparc/include/asm/pcic.h
@@ -29,11 +29,17 @@ struct linux_pcic {
int pcic_imdim;
};
-extern int pcic_probe(void);
-/* Erm... MJ redefined pcibios_present() so that it does not work early. */
+#ifdef CONFIG_PCI
extern int pcic_present(void);
+extern int pcic_probe(void);
+extern void pci_time_init(void);
extern void sun4m_pci_init_IRQ(void);
-
+#else
+static inline int pcic_present(void) { return 0; }
+static inline int pcic_probe(void) { return 0; }
+static inline void pci_time_init(void) {}
+static inline void sun4m_pci_init_IRQ(void) {}
+#endif
#endif
/* Size of PCI I/O space which we relocate. */
OpenPOWER on IntegriCloud