Patchwork [v3] sparc,leon: updated GRPCI2 config name

login
register
mail settings
Submitter Daniel Hellstrom
Date March 5, 2013, 5:04 p.m.
Message ID <1362503061-31756-1-git-send-email-daniel@gaisler.com>
Download mbox | patch
Permalink /patch/225091/
State Accepted
Delegated to: David Miller
Headers show

Comments

Daniel Hellstrom - March 5, 2013, 5:04 p.m.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---
 arch/sparc/Kconfig         |    2 +-
 arch/sparc/kernel/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Sam Ravnborg - March 5, 2013, 8 p.m.
On Tue, Mar 05, 2013 at 06:04:21PM +0100, Daniel Hellstrom wrote:
> Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - March 20, 2013, 6:41 p.m.
From: Sam Ravnborg <sam@ravnborg.org>
Date: Tue, 5 Mar 2013 21:00:48 +0100

> On Tue, Mar 05, 2013 at 06:04:21PM +0100, Daniel Hellstrom wrote:
>> Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
> Acked-by: Sam Ravnborg <sam@ravnborg.org>

Applied to sparc-next
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index ad5ad8f..dbc7082 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -511,7 +511,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 c90a2a0..d2936d0 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