diff options
| author | Daniel Hellstrom <daniel@gaisler.com> | 2013-03-05 07:04:21 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 11:06:54 -0700 |
| commit | 1ab0a67601ca7be81bfaaa0a2540ee0d0393f40b (patch) | |
| tree | 205a5b8173050242d56f781e6854e8a8f909d6bb | |
| parent | d8650106b4627b4686d56d8090a3d61b8ea001cd (diff) | |
| download | linux-3.10-1ab0a67601ca7be81bfaaa0a2540ee0d0393f40b.tar.gz linux-3.10-1ab0a67601ca7be81bfaaa0a2540ee0d0393f40b.tar.bz2 linux-3.10-1ab0a67601ca7be81bfaaa0a2540ee0d0393f40b.zip | |
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>
| -rw-r--r-- | arch/sparc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index b95e0696b61..c3c3ad25612 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 c90a2a05ccd..d2936d0600b 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 |