Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Tue, 20 May 2008 15:58:01 -0700
Received: from ausesmta2-1.messageone.com ([64.20.241.45]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Tue, 20 May 2008 15:58:01 -0700
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])
	by ausesmta2-1.messageone.com (8.13.8/8.13.8) with ESMTP id m4KMvxxk003840
	for <andy.sharp@onstor.com>; Tue, 20 May 2008 17:58:00 -0500
Received: from localhost.localdomain ([127.0.0.1]:62865 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S28575663AbYETW5e (ORCPT <rfc822;andy.sharp@onstor.com>);
	Tue, 20 May 2008 23:57:34 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 20 May 2008 23:57:18 +0100 (BST)
Received: from smtp5.pp.htv.fi ([213.243.153.39]:13455 "EHLO smtp5.pp.htv.fi")
	by ftp.linux-mips.org with ESMTP id S28575640AbYETW5P (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Tue, 20 May 2008 23:57:15 +0100
Received: from cs181133002.pp.htv.fi (cs181133002.pp.htv.fi [82.181.133.2])
	by smtp5.pp.htv.fi (Postfix) with ESMTP id 4F3905BC01C;
	Wed, 21 May 2008 01:57:12 +0300 (EEST)
Date: 	Wed, 21 May 2008 01:55:02 +0300
From: Adrian Bunk <bunk@kernel.org>
To: ralf@linux-mips.org
Cc: linux-mips@linux-mips.org, "Robert P. J. Day" <rpjday@crashcourse.ca>
Subject: [2.6 patch] mips/kernel/Makefile: remove CONFIG_CPU_R4000 line
Message-ID: <20080520225502.GC16264@cs181133002.pp.htv.fi>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.5.17+20080114 (2008-01-14)
X-archive-position: 19328
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: bunk@kernel.org
Precedence: bulk
X-list: 	linux-mips
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-05-20_07:2008-05-20,2008-05-20,2008-05-20 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: linux-mips-bounce@linux-mips.org
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0805200204
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 20 May 2008 22:58:01.0650 (UTC) FILETIME=[F4665120:01C8BACC]

The existing options are named CONFIG_CPU_R4300 and CONFIG_CPU_R4X00, 
and they are directly below.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
372ea8980a1d94e474b512bd20d870ee3ea15099 diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index cc02440..65e46a6 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -30,7 +30,6 @@ obj-$(CONFIG_CPU_LOONGSON2)	+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_MIPS32)	+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_MIPS64)	+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R3000)		+= r2300_fpu.o r2300_switch.o
-obj-$(CONFIG_CPU_R4000)		+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R4300)		+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R4X00)		+= r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_R5000)		+= r4k_fpu.o r4k_switch.o


