rpms/kernel/devel linux-2.6-compile-fixes.patch,1.125,1.126

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17034

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
better fix

linux-2.6-compile-fixes.patch:
 linux-2.6.19.noarch/drivers/macintosh/via-pmu-backlight.c |    2 -
 linux-2.6.19.noarch/drivers/macintosh/via-pmu.c           |    1 
 linux-2.6.19.noarch/include/asm-i386/desc.h               |   28 +++++++-------
 linux-2.6.19.noarch/include/asm-powerpc/io.h              |    1 
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c        |    4 ++
 5 files changed, 21 insertions(+), 15 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- linux-2.6-compile-fixes.patch	29 Dec 2006 07:09:30 -0000	1.125
+++ linux-2.6-compile-fixes.patch	29 Dec 2006 07:14:15 -0000	1.126
@@ -102,18 +102,19 @@
 drivers/net/smc-ultra.c: In function 'ultra_block_input':
 drivers/net/smc-ultra.c:458: error: implicit declaration of function 'eth_io_copy_and_sum'
 
-diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
-index 1cd5323..ec7bb5b 100644
---- a/include/asm-powerpc/io.h
-+++ b/include/asm-powerpc/io.h
-@@ -732,6 +732,7 @@ static inline void * bus_to_virt(unsigned long address)
- 
- #endif /* CONFIG_PPC32 */
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.19.noarch/include/asm-powerpc/io.h~	2006-12-29 02:11:33.000000000 -0500
++++ linux-2.6.19.noarch/include/asm-powerpc/io.h	2006-12-29 02:12:30.000000000 -0500
+@@ -729,6 +729,7 @@ static inline void * bus_to_virt(unsigne
+ }
  
-+#define eth_io_copy_and_sum(a,b,c,d)            eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))
+ #define page_to_bus(page)	(page_to_phys(page) + PCI_DRAM_OFFSET)
++#define eth_io_copy_and_sum(a,b,c,d)	eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d))
  
- #endif /* __KERNEL__ */
+ #endif /* CONFIG_PPC32 */
  
+
 --- linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c~	2006-11-29 21:57:37.000000000 +0000
 +++ linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c	2006-12-13 16:53:11.000000000 +0000
 @@ -43,9 +43,11 @@ void __spin_yield(raw_spinlock_t *lock)