Просмотр исходного кода

sparc,leon: updated GRPCI2 config name

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Daniel Hellstrom 13 лет назад
Родитель
Сommit
1ab0a67601
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      arch/sparc/Kconfig
  2. 1 1
      arch/sparc/kernel/Makefile

+ 1 - 1
arch/sparc/Kconfig

@@ -505,7 +505,7 @@ config SPARC_GRPCI1
 	  from the bootloader that makes the GRPCI to generate interrupts
 	  from the bootloader that makes the GRPCI to generate interrupts
 	  on detected PCI Parity and System errors.
 	  on detected PCI Parity and System errors.
 
 
-config GRPCI2
+config SPARC_GRPCI2
 	bool "GRPCI2 Host Bridge Support"
 	bool "GRPCI2 Host Bridge Support"
 	depends on LEON_PCI
 	depends on LEON_PCI
 	default y
 	default y

+ 1 - 1
arch/sparc/kernel/Makefile

@@ -74,7 +74,7 @@ obj-y                     += dma.o
 
 
 obj-$(CONFIG_PCIC_PCI)    += pcic.o
 obj-$(CONFIG_PCIC_PCI)    += pcic.o
 obj-$(CONFIG_LEON_PCI)    += leon_pci.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_SPARC_GRPCI1)+= leon_pci_grpci1.o
 
 
 obj-$(CONFIG_SMP)         += trampoline_$(BITS).o smp_$(BITS).o
 obj-$(CONFIG_SMP)         += trampoline_$(BITS).o smp_$(BITS).o