Hello Ralf,
I made a patch for fixing pci-vr41xx.c build.
Please apply this patch to v2.6.
Yoichi
diff -urN -X dontdiff linux-orig/arch/mips/pci/pci-vr41xx.c
linux/arch/mips/pci/pci-vr41xx.c
--- linux-orig/arch/mips/pci/pci-vr41xx.c Fri Jun 13 23:19:56 2003
+++ linux/arch/mips/pci/pci-vr41xx.c Tue Feb 3 23:00:27 2004
@@ -8,7 +8,7 @@
* Author: Yoichi Yuasa
* yyuasa@mvista.com or source@mvista.com
*
- * Copyright 2001,2002 MontaVista Software Inc.
+ * Copyright 2001-2003 MontaVista Software Inc.
*
* 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 the
@@ -49,9 +49,7 @@
#include <asm/pci_channel.h>
#include <asm/vr41xx/vr41xx.h>
-#include "pciu.h"
-
-extern unsigned long vr41xx_vtclock;
+#include "pci-vr41xx.h"
static inline int vr41xx_pci_config_access(unsigned char bus,
unsigned int devfn, int where)
@@ -150,6 +148,7 @@
void __init vr41xx_pciu_init(struct vr41xx_pci_address_map *map)
{
struct vr41xx_pci_address_space *s;
+ unsigned long vtclock;
u32 config;
int n;
@@ -169,11 +168,12 @@
udelay(1);
/* Select PCI clock */
- if (vr41xx_vtclock < MAX_PCI_CLOCK)
+ vtclock = vr41xx_get_vtclock_frequency();
+ if (vtclock < MAX_PCI_CLOCK)
writel(EQUAL_VTCLOCK, PCICLKSELREG);
- else if ((vr41xx_vtclock / 2) < MAX_PCI_CLOCK)
+ else if ((vtclock / 2) < MAX_PCI_CLOCK)
writel(HALF_VTCLOCK, PCICLKSELREG);
- else if ((vr41xx_vtclock / 4) < MAX_PCI_CLOCK)
+ else if ((vtclock / 4) < MAX_PCI_CLOCK)
writel(QUARTER_VTCLOCK, PCICLKSELREG);
else
printk(KERN_INFO "Warning: PCI Clock is over 33MHz.\n");
|