summaryrefslogtreecommitdiffstats
path: root/arch/mips/vr41xx/nec-cmbvr4133/setup.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-10-13 15:58:23 +0200
committerDavid Woodhouse <dwmw2@infradead.org>2007-10-13 15:58:23 +0200
commitebf8889bd1fe3615991ff4494635d237280652a2 (patch)
tree10fb735717122bbb86474339eac07f26e7ccdf40 /arch/mips/vr41xx/nec-cmbvr4133/setup.c
parentMerge Linux 2.6.23 (diff)
parentx86/pci/acpi: fix DMI const-ification fallout (diff)
downloadlinux-ebf8889bd1fe3615991ff4494635d237280652a2.tar.xz
linux-ebf8889bd1fe3615991ff4494635d237280652a2.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/vr41xx/nec-cmbvr4133/setup.c')
-rw-r--r--arch/mips/vr41xx/nec-cmbvr4133/setup.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index b20b93b2b95e..58e47686b499 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -64,7 +64,6 @@ static void __init nec_cmbvr4133_setup(void)
#endif
set_io_port_base(KSEG1ADDR(0x16000000));
- mips_machgroup = MACH_GROUP_NEC_VR41XX;
mips_machtype = MACH_NEC_CMBVR4133;
#ifdef CONFIG_PCI