All pastes #3976 Raw Edit

Anonymous

public text v1 · immutable
#3976 ·published 2005-01-09 19:58 UTC
rendered paste body
this patch:

Index: doc2000.h
===================================================================
RCS file: /cvs/linux/kernel26/include/linux/mtd/doc2000.h,v
retrieving revision 1.2
diff -w -u -d -p -r1.2 doc2000.h
--- doc2000.h	8 Feb 2004 03:26:03 -0000	1.2
+++ doc2000.h	9 Jan 2005 19:57:08 -0000
@@ -80,7 +80,7 @@
  * On PPC, it's mmap'd and 16-bit wide.
  * Others use readb/writeb 
  */
-#if defined(__arm__)
+/*#if defined(__arm__)
 #define ReadDOC_(adr, reg)      ((unsigned char)(*(volatile __u32 *)(((unsigned long)adr)+((reg)<<2))))
 #define WriteDOC_(d, adr, reg)  do{ *(volatile __u32 *)(((unsigned long)adr)+((reg)<<2)) = (__u32)d; wmb();} while(0)
 #define DOC_IOREMAP_LEN 0x8000
@@ -88,12 +88,12 @@
 #define ReadDOC_(adr, reg)      ((unsigned char)(*(volatile __u16 *)(((unsigned long)adr)+((reg)<<1))))
 #define WriteDOC_(d, adr, reg)  do{ *(volatile __u16 *)(((unsigned long)adr)+((reg)<<1)) = (__u16)d; wmb();} while(0)
 #define DOC_IOREMAP_LEN 0x4000
-#else
+#else*/
 #define ReadDOC_(adr, reg)      readb(((unsigned long)adr) + (reg))
 #define WriteDOC_(d, adr, reg)  writeb(d, ((unsigned long)adr) + (reg))
 #define DOC_IOREMAP_LEN 0x2000
 
-#endif
+/*#endif*/
 
 #if defined(__i386__) || defined(__x86_64__)
 #define USE_MEMCPY


and this one:

Index: docprobe.c
===================================================================
RCS file: /cvs/linux/kernel26/drivers/mtd/devices/docprobe.c,v
retrieving revision 1.2
diff -w -u -d -p -r1.2 docprobe.c
--- docprobe.c	16 Aug 2004 12:48:53 -0000	1.2
+++ docprobe.c	9 Jan 2005 19:57:47 -0000
@@ -90,6 +90,7 @@ static unsigned long __initdata doc_loca
 ##else
 #warning Unknown architecture for DiskOnChip. No default probe locations defined
 #endif
+	0x0,
 	0xffffffff };
 
 /* doccheck: Probe a given memory window to see if there's a DiskOnChip present */