From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>, Ralf Baechle <ralf@linux-mips.org>
Cc: linux-kernel@vger.kernel.org, linux-mips@linux-mips.org
Subject: [-mm patch] more vr4181 removal
Date: Sun, 7 Aug 2005 17:43:00 +0200 [thread overview]
Message-ID: <20050807154300.GC3513@stusta.de> (raw)
In-Reply-To: <20050807014214.45968af3.akpm@osdl.org>
On Sun, Aug 07, 2005 at 01:42:14AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.13-rc4-mm1:
>...
> +mips-remove-vr4181-support.patch
>...
> MIPS stuff
>...
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
arch/mips/Kconfig | 12 +-----------
arch/mips/Makefile | 7 -------
arch/mips/kernel/cpu-probe.c | 6 ------
3 files changed, 1 insertion(+), 24 deletions(-)
--- linux-2.6.13-rc5-mm1-full/arch/mips/Kconfig.old 2005-08-07 17:31:12.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/arch/mips/Kconfig 2005-08-07 17:32:04.000000000 +0200
@@ -445,11 +445,6 @@
depends on DDB5477
default 0
-config NEC_OSPREY
- bool "Support for NEC Osprey board"
- select DMA_NONCOHERENT
- select IRQ_CPU
-
config SGI_IP22
bool "Support for SGI IP22 (Indy/Indigo2)"
select ARC
@@ -974,7 +969,7 @@
config CPU_LITTLE_ENDIAN
bool "Generate little endian code"
- default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA
+ default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA
default n if MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927
help
Some MIPS machines can be configured for either little or big endian
@@ -1091,11 +1086,6 @@
config HAVE_STD_PC_SERIAL_PORT
bool
-config VR4181
- bool
- depends on NEC_OSPREY
- default y
-
config ARC_CONSOLE
bool "ARC console support"
depends on SGI_IP22 || SNI_RM200_PCI
--- linux-2.6.13-rc5-mm1-full/arch/mips/Makefile.old 2005-08-07 17:32:19.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/arch/mips/Makefile 2005-08-07 17:32:30.000000000 +0200
@@ -469,13 +469,6 @@
load-$(CONFIG_LASAT) += 0xffffffff80000000
#
-# NEC Osprey (vr4181) board
-#
-core-$(CONFIG_NEC_OSPREY) += arch/mips/vr4181/common/ \
- arch/mips/vr4181/osprey/
-load-$(CONFIG_NEC_OSPREY) += 0xffffffff80002000
-
-#
# Common VR41xx
#
core-$(CONFIG_MACH_VR41XX) += arch/mips/vr41xx/common/
--- linux-2.6.13-rc5-mm1-full/arch/mips/kernel/cpu-probe.c.old 2005-08-07 17:32:45.000000000 +0200
+++ linux-2.6.13-rc5-mm1-full/arch/mips/kernel/cpu-probe.c 2005-08-07 17:33:46.000000000 +0200
@@ -229,15 +229,9 @@
break;
case PRID_IMP_VR41XX:
switch (c->processor_id & 0xf0) {
-#ifndef CONFIG_VR4181
case PRID_REV_VR4111:
c->cputype = CPU_VR4111;
break;
-#else
- case PRID_REV_VR4181:
- c->cputype = CPU_VR4181;
- break;
-#endif
case PRID_REV_VR4121:
c->cputype = CPU_VR4121;
break;
next prev parent reply other threads:[~2005-08-07 15:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-07 8:42 2.6.13-rc5-mm1 Andrew Morton
2005-08-07 13:36 ` [PATCH] mips: moreover remove vr4181 Yoichi Yuasa
2005-08-07 15:43 ` Adrian Bunk [this message]
2005-08-07 16:03 ` [-mm patch] drivers/net/phy/phy_device.c: fix compilation Adrian Bunk
2005-08-07 18:51 ` 2.6.13-rc5-mm1 Avuton Olrich
2005-08-07 19:43 ` [-mm patch] fix PHYCONTROL=n compilation Adrian Bunk
2005-08-07 23:13 ` [2.6 patch] drivers/net/sk98lin/: possible cleanups Adrian Bunk
2005-08-08 0:45 ` 2.6.13-rc5-mm1 Rogério Brito
2005-08-08 0:52 ` 2.6.13-rc5-mm1 Andrew Morton
2005-08-08 10:00 ` 2.6.13-rc5-mm1 Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050807154300.GC3513@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.