CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/01/15 01:03:03

Modified files:
        arch/mips/pci  : pci-vr41xx.c pci-vr41xx.h 

Log message:
        Don't define any bloody names starting with CONFIG_ ...

diff -urN linux/arch/mips/pci/pci-vr41xx.c linux/arch/mips/pci/pci-vr41xx.c
--- linux/arch/mips/pci/pci-vr41xx.c    2004/08/26 20:18:00     1.6
+++ linux/arch/mips/pci/pci-vr41xx.c    2005/01/15 01:03:03     1.7
@@ -270,7 +270,7 @@
        /* Clear bus error */
        readl(BUSERRADREG);
 
-       writel(CONFIG_DONE, PCIENREG);
+       writel(BLOODY_CONFIG_DONE, PCIENREG);
 
        if (setup->mem_resource != NULL)
                vr41xx_pci_controller.mem_resource = setup->mem_resource;
diff -urN linux/arch/mips/pci/pci-vr41xx.h linux/arch/mips/pci/pci-vr41xx.h
--- linux/arch/mips/pci/pci-vr41xx.h    2004/05/26 19:31:41     1.4
+++ linux/arch/mips/pci/pci-vr41xx.h    2005/01/15 01:03:03     1.5
@@ -73,7 +73,7 @@
 #define PCIRECONTREG           KSEG1ADDR(0x0f000c30)
  #define RTRYCNT(reg)          ((reg) & 0x000000ffU)
 #define PCIENREG               KSEG1ADDR(0x0f000c34)
- #define CONFIG_DONE           0x4U
+ #define BLOODY_CONFIG_DONE    0x4U
 #define PCICLKSELREG           KSEG1ADDR(0x0f000c38)
  #define EQUAL_VTCLOCK         0x2U
  #define HALF_VTCLOCK          0x0U