diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index b95e0696b614f..c3c3ad25612b1 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 c90a2a05ccdbd..d2936d0600bd8 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