From 1ab0a67601ca7be81bfaaa0a2540ee0d0393f40b Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Tue, 5 Mar 2013 07:04:21 +0000 Subject: sparc,leon: updated GRPCI2 config name Signed-off-by: Daniel Hellstrom Acked-by: Sam Ravnborg Signed-off-by: David S. Miller --- arch/sparc/Kconfig | 2 +- arch/sparc/kernel/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/sparc') diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index b95e0696b614..c3c3ad25612b 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -505,7 +505,7 @@ config SPARC_GRPCI1 from the bootloader that makes the GRPCI to generate interrupts on detected PCI Parity and System errors. -config GRPCI2 +config SPARC_GRPCI2 bool "GRPCI2 Host Bridge Support" depends on LEON_PCI default y diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index c90a2a05ccdb..d2936d0600bd 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile @@ -74,7 +74,7 @@ obj-y += dma.o obj-$(CONFIG_PCIC_PCI) += pcic.o obj-$(CONFIG_LEON_PCI) += leon_pci.o -obj-$(CONFIG_GRPCI2) += leon_pci_grpci2.o +obj-$(CONFIG_SPARC_GRPCI2)+= leon_pci_grpci2.o obj-$(CONFIG_SPARC_GRPCI1)+= leon_pci_grpci1.o obj-$(CONFIG_SMP) += trampoline_$(BITS).o smp_$(BITS).o -- cgit v1.2.3-55-g7522