SOURCES: kernel-desktop-small_fixes.patch - 2.6.20: arch/powerpc n...

[sparky]

Author: sparky                       Date: Tue Mar 27 22:52:44 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.6.20: arch/powerpc now uses include/asm-powerpc/io.h

---- Files affected:
SOURCES:
   kernel-desktop-small_fixes.patch (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-small_fixes.patch
diff -u SOURCES/kernel-desktop-small_fixes.patch:1.15 SOURCES/kernel-desktop-small_fixes.patch:1.16
--- SOURCES/kernel-desktop-small_fixes.patch:1.15	Wed Nov 22 14:45:20 2006
+++ SOURCES/kernel-desktop-small_fixes.patch	Wed Mar 28 00:52:38 2007
@@ -8,19 +8,19 @@
  
  #include <asm/atomic.h>
  #include <asm/types.h>
---- linux-2.6.17/include/asm-ppc/io.h~	2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.17/include/asm-ppc/io.h	2006-06-22 02:44:19.000000000 +0000
-@@ -445,6 +445,10 @@
- #define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)
+--- linux-2.6.20/include/asm-powerpc/io.h~	2007-02-04 18:44:54.000000000 +0000
++++ linux-2.6.20/include/asm-powerpc/io.h	2007-03-27 16:30:27.000000000 +0000
+@@ -730,6 +730,10 @@
+ 
  #define page_to_bus(page)	(page_to_phys(page) + PCI_DRAM_OFFSET)
  
 +#define isa_virt_to_bus virt_to_phys
 +#define isa_page_to_bus page_to_phys
 +#define isa_bus_to_virt phys_to_virt
-+
- /* Enforce in-order execution of data I/O.
-  * No distinction between read/write on PPC; use eieio for all three.
-  */
++#define eth_io_copy_and_sum(a,b,c,d)	eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))
+ #endif /* CONFIG_PPC32 */
+ 
+ 
 --- linux-2.6.18/drivers/usb/atm/cxacru.c.orig	2006-09-20 05:42:06.000000000 +0200
 +++ linux-2.6.18/drivers/usb/atm/cxacru.c	2006-11-22 10:16:28.000000000 +0100
 @@ -793,6 +793,9 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-small_fixes.patch?r1=1.15&r2=1.16&f=u