CVS Update@linux-mips.org: linux

[macro@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     macro@ftp.linux-mips.org        05/06/13 20:55:44

Modified files:
        drivers/net    : declance.c 
        drivers/scsi   : dec_esp.c 

Log message:
        These should really be addresses obtained with ioremap() or some
        bus-specific backend, but for now...

diff -urN linux/drivers/net/declance.c linux/drivers/net/declance.c
--- linux/drivers/net/declance.c        2005/06/13 19:51:36     1.37
+++ linux/drivers/net/declance.c        2005/06/13 19:55:42     1.38
@@ -237,7 +237,7 @@
 /*
  * This works *only* for the ring descriptors
  */
-#define LANCE_ADDR(x) (PHYSADDR(x) >> 1)
+#define LANCE_ADDR(x) (CPHYSADDR(x) >> 1)
 
 struct lance_private {
        struct net_device *next;
@@ -1102,7 +1102,7 @@
                /* Setup I/O ASIC LANCE DMA.  */
                lp->dma_irq = dec_interrupt[DEC_IRQ_LANCE_MERR];
                ioasic_write(IO_REG_LANCE_DMA_P,
-                            PHYSADDR(dev->mem_start) << 3);
+                            CPHYSADDR(dev->mem_start) << 3);
 
                break;
 
diff -urN linux/drivers/scsi/dec_esp.c linux/drivers/scsi/dec_esp.c
--- linux/drivers/scsi/dec_esp.c        2004/10/25 20:44:35     1.27
+++ linux/drivers/scsi/dec_esp.c        2005/06/13 19:55:44     1.28
@@ -228,7 +228,7 @@
                        mem_start = get_tc_base_addr(slot);
 
                        /* Store base addr into esp struct */
-                       esp->slot = PHYSADDR(mem_start);
+                       esp->slot = CPHYSADDR(mem_start);
 
                        esp->dregs = 0;
                        esp->eregs = (struct ESP_regs *) (mem_start + 
DEC_SCSI_SREG);