rpms/kernel/devel linux-2.6-compile-fixes.patch,1.113,1.114

[fedora-cvs-commits at redhat.com]

Author: davej

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

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

linux-2.6-compile-fixes.patch:
 arch/powerpc/sysdev/rom.c                          |    1 
 include/asm-powerpc/Kbuild                         |    2 -
 linux-2.6.19.noarch/drivers/char/tty_io.c          |    1 
 linux-2.6.19.noarch/drivers/macintosh/via-pmu.c    |    1 
 linux-2.6.19.noarch/drivers/media/video/Kconfig    |    2 -
 linux-2.6.19.noarch/drivers/s390/char/fs3270.c     |    1 
 linux-2.6.19.noarch/include/asm-i386/desc.h        |   28 ++++++++++-----------
 linux-2.6.19.noarch/include/asm-ia64/scatterlist.h |    8 ++++++
 8 files changed, 28 insertions(+), 16 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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- linux-2.6-compile-fixes.patch	12 Dec 2006 16:38:45 -0000	1.113
+++ linux-2.6-compile-fixes.patch	12 Dec 2006 17:36:53 -0000	1.114
@@ -124,3 +124,25 @@
  
  /*
   * Initialize the console device. This is called *early*, so
+
+drivers/ieee1394/sbp2.c: In function 'sbp2_prep_command_orb_sg':
+drivers/ieee1394/sbp2.c:1473: error: implicit declaration of function 'sg_dma_len'
+drivers/ieee1394/sbp2.c:1474: error: implicit declaration of function 'sg_dma_address'
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.19.noarch/include/asm-ia64/scatterlist.h~	2006-12-12 12:35:24.000000000 -0500
++++ linux-2.6.19.noarch/include/asm-ia64/scatterlist.h	2006-12-12 12:35:47.000000000 -0500
+@@ -25,4 +25,12 @@ struct scatterlist {
+  */
+ #define ISA_DMA_THRESHOLD	0xffffffff
+ 
++/* These macros should be used after a pci_map_sg call has been done
++ * to get bus addresses of each of the SG entries and their lengths.
++ * You should only work with the number of sg entries pci_map_sg
++ * returns.
++ */
++#define sg_dma_address(sg)	((sg)->dma_address)
++#define sg_dma_len(sg)		((sg)->dma_length)
++
+ #endif /* _ASM_IA64_SCATTERLIST_H */