aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/ops-vr41xx.c
diff options
context:
space:
mode:
authorYoichi Yuasa <yuasa@hh.iij4u.or.jp>2005-04-16 15:24:40 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:24:40 -0700
commit5dfa9c1b4f5d399a2800d8486ca188988900db87 (patch)
tree83e431fef2dd4c5966507bdfa4ffb4f8c1532e32 /arch/mips/pci/ops-vr41xx.c
parent4bfa437cf137fc653b286c110d849ff1ad2aee2b (diff)
downloadkernel_samsung_smdk4412-5dfa9c1b4f5d399a2800d8486ca188988900db87.tar.gz
kernel_samsung_smdk4412-5dfa9c1b4f5d399a2800d8486ca188988900db87.tar.bz2
kernel_samsung_smdk4412-5dfa9c1b4f5d399a2800d8486ca188988900db87.zip
[PATCH] mips: update VR41xx CPU-PCI bridge support
This patch updates NEC VR4100 series CPU-PCI bridge support. Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/pci/ops-vr41xx.c')
-rw-r--r--arch/mips/pci/ops-vr41xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/pci/ops-vr41xx.c b/arch/mips/pci/ops-vr41xx.c
index 44654605e46..430429b22ae 100644
--- a/arch/mips/pci/ops-vr41xx.c
+++ b/arch/mips/pci/ops-vr41xx.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2001-2003 MontaVista Software Inc.
* Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
- * Copyright (C) 2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ * Copyright (C) 2004-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -29,8 +29,8 @@
#include <asm/io.h>
-#define PCICONFDREG KSEG1ADDR(0x0f000c14)
-#define PCICONFAREG KSEG1ADDR(0x0f000c18)
+#define PCICONFDREG (void __iomem *)KSEG1ADDR(0x0f000c14)
+#define PCICONFAREG (void __iomem *)KSEG1ADDR(0x0f000c18)
static inline int set_pci_configuration_address(unsigned char number,
unsigned int devfn, int where)