diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-03 13:50:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-03 13:50:25 +1000 |
| commit | cb5a75d564770dd457effcbe2b033700a930e23c (patch) | |
| tree | 3c171b522be4019afd949b43ac4680c9b143f6d8 | |
| parent | 6af367db93ac105b910e8f2483ce2590530fb5a2 (diff) | |
Revert "sparc32: added CONFIG_PCIC_PCI Kconfig setting"
This reverts commit cfe3af5dde34a019c1bd2485b1dc0f2d7a326ccd.
| -rw-r--r-- | arch/sparc/Kconfig | 5 | ||||
| -rw-r--r-- | arch/sparc/include/asm/pcic.h | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/entry.S | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index d1bd0ad78b39..789e178bd75d 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -527,11 +527,6 @@ 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" diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h index 6676cbcc8b6a..7eb5d78f5211 100644 --- a/arch/sparc/include/asm/pcic.h +++ b/arch/sparc/include/asm/pcic.h @@ -29,7 +29,7 @@ struct linux_pcic { int pcic_imdim; }; -#ifdef CONFIG_PCIC_PCI +#ifdef CONFIG_PCI extern int pcic_present(void); extern int pcic_probe(void); extern void pci_time_init(void); diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index 59a2256aee38..9cff2709a96d 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile @@ -73,7 +73,7 @@ obj-$(CONFIG_SPARC64_SMP) += cpumap.o obj-y += dma.o -obj-$(CONFIG_PCIC_PCI) += pcic.o +obj-$(CONFIG_SPARC32_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 diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index c4e616711348..8341963f4c84 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -1604,7 +1604,7 @@ restore_current: retl nop -#ifdef CONFIG_PCIC_PCI +#ifdef CONFIG_PCI #include <asm/pcic.h> .align 4 @@ -1650,7 +1650,7 @@ pcic_nmi_trap_patch: rd %psr, %l0 .word 0 -#endif /* CONFIG_PCIC_PCI */ +#endif /* CONFIG_PCI */ .globl flushw_all flushw_all: |