patch-2.4.14 linux/arch/arm/mach-sa1100/dma-sa1111.c

• Lines: 26
• Date: Thu Oct 25 13:53:46 2001
• Orig file: v2.4.13/linux/arch/arm/mach-sa1100/dma-sa1111.c
• Orig date: Tue Oct 23 22:48:49 2001

diff -u --recursive --new-file v2.4.13/linux/arch/arm/mach-sa1100/dma-sa1111.c linux/arch/arm/mach-sa1100/dma-sa1111.c
@@ -23,7 +23,6 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 
-
 // #define DEBUG
 #ifdef DEBUG
 #define DPRINTK( s, arg... )  printk( "dma<%s>: " s, dma->device_id , ##arg )
@@ -305,7 +304,7 @@
 	 * SDRAM bank 1 on Neponset). The default configuration selects
 	 * Assabet, so any address in bank 1 is necessarily invalid.
 	 */
-	if((machine_is_assabet() || machine_is_pfs168()) && addr >= _DRAMBnk1)
+	if((machine_is_assabet() || machine_is_pfs168()) && addr >= 0xc8000000)
 	  	return -1;
 
 	/* The bug only applies to buffers located more than one megabyte
@@ -340,7 +339,7 @@
 		  	return -1;
 		break;
 	default:
-	  	printk(KERN_ERR "%s(): invalid SMCR DRAC value 0%o\n",
+	  	printk(KERN_ERR "%s(): invalid SMCR DRAC value 0%lo\n",
 		       __FUNCTION__, FExtr(SBI_SMCR, SMCR_DRAC));
 		return -1;
 	}