Commit cfe3af5d authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by David S. Miller

sparc32: added CONFIG_PCIC_PCI Kconfig setting

Signed-off-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1fa7b6a2
......@@ -528,6 +528,11 @@ config PCI_DOMAINS
config PCI_SYSCALL
def_bool PCI
config PCIC_PCI
bool
depends on PCI && !SPARC_LEON
default y
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
......
......@@ -29,7 +29,7 @@ struct linux_pcic {
int pcic_imdim;
};
#ifdef CONFIG_PCI
#ifdef CONFIG_PCIC_PCI
extern int pcic_present(void);
extern int pcic_probe(void);
extern void pci_time_init(void);
......
......@@ -73,7 +73,7 @@ obj-$(CONFIG_SPARC64_SMP) += cpumap.o
obj-y += dma.o
obj-$(CONFIG_SPARC32_PCI) += pcic.o
obj-$(CONFIG_PCIC_PCI) += pcic.o
obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o
obj-$(CONFIG_SPARC32_SMP) += sun4m_smp.o sun4d_smp.o leon_smp.o
......
......@@ -1604,7 +1604,7 @@ restore_current:
retl
nop
#ifdef CONFIG_PCI
#ifdef CONFIG_PCIC_PCI
#include <asm/pcic.h>
.align 4
......@@ -1650,7 +1650,7 @@ pcic_nmi_trap_patch:
rd %psr, %l0
.word 0
#endif /* CONFIG_PCI */
#endif /* CONFIG_PCIC_PCI */
.globl flushw_all
flushw_all:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment