From 709e99bbce5cd5e8c808d51e2322ddde81191af0 Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@netlogicmicro.com>
Date: Fri, 11 Nov 2011 17:07:40 +0530
Subject: [PATCH] --- yaml --- r: 284783 b: refs/heads/master c:
 c3c8cfb979d1a3c514d6ef88204f05dcbd1934df h: refs/heads/master i:   284781:
 d1955d6b8b3932a83172c8b5fca7b750e34de829   284779:
 8d819cab4d59ec06f1597a444fc2ca9fe3d42a18   284775:
 b141944081678be810fee00ba02de0a1c345d0ab   284767:
 8bd1b11895d5703caa470cdc53aaafb587548ea9 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/mips/Kconfig           | 1 -
 trunk/arch/mips/netlogic/Kconfig  | 3 ---
 trunk/arch/mips/netlogic/Platform | 4 ++--
 trunk/arch/mips/pci/Makefile      | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 376aab61b69f..a0bf222b6d77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: faabeb9e57d665154fbc423e6e02bc16d6384d8e
+refs/heads/master: c3c8cfb979d1a3c514d6ef88204f05dcbd1934df
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index 04ac89c6ab68..58515fdf223e 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -761,7 +761,6 @@ config NLM_XLR_BOARD
 	depends on EXPERIMENTAL
 	select BOOT_ELF32
 	select NLM_COMMON
-	select NLM_XLR
 	select SYS_HAS_CPU_XLR
 	select SYS_SUPPORTS_SMP
 	select HW_HAS_PCI
diff --git a/trunk/arch/mips/netlogic/Kconfig b/trunk/arch/mips/netlogic/Kconfig
index a5ca743613f2..75bec44b5856 100644
--- a/trunk/arch/mips/netlogic/Kconfig
+++ b/trunk/arch/mips/netlogic/Kconfig
@@ -1,5 +1,2 @@
 config NLM_COMMON
 	bool
-
-config NLM_XLR
-	bool
diff --git a/trunk/arch/mips/netlogic/Platform b/trunk/arch/mips/netlogic/Platform
index 4fb6b8351c34..18aaf438ee42 100644
--- a/trunk/arch/mips/netlogic/Platform
+++ b/trunk/arch/mips/netlogic/Platform
@@ -7,10 +7,10 @@ cflags-$(CONFIG_NLM_COMMON)	+= -I$(srctree)/arch/mips/include/asm/netlogic
 #
 # use mips64 if xlr is not available
 #
-cflags-$(CONFIG_NLM_XLR)	+= $(call cc-option,-march=xlr,-march=mips64)
+cflags-$(CONFIG_CPU_XLR)	+= $(call cc-option,-march=xlr,-march=mips64)
 
 #
 # NETLOGIC processor support
 #
-platform-$(CONFIG_NLM_XLR)  	+= netlogic/xlr
+platform-$(CONFIG_CPU_XLR)  	+= netlogic/xlr
 load-$(CONFIG_NLM_COMMON)  	+= 0xffffffff80100000
diff --git a/trunk/arch/mips/pci/Makefile b/trunk/arch/mips/pci/Makefile
index bb82cbdbc62a..65ca05c776d5 100644
--- a/trunk/arch/mips/pci/Makefile
+++ b/trunk/arch/mips/pci/Makefile
@@ -55,7 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o
 obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o
 obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= pci-octeon.o pcie-octeon.o
-obj-$(CONFIG_NLM_XLR)		+= pci-xlr.o
+obj-$(CONFIG_CPU_XLR)		+= pci-xlr.o
 
 ifdef CONFIG_PCI_MSI
 obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= msi-octeon.o