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

[fedora-cvs-commits at redhat.com]

Author: davej

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

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/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 ++++++
 7 files changed, 27 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.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- linux-2.6-compile-fixes.patch	12 Dec 2006 17:36:53 -0000	1.114
+++ linux-2.6-compile-fixes.patch	12 Dec 2006 18:14:33 -0000	1.115
@@ -70,17 +70,7 @@
  #endif /* !__ASSEMBLY__ */
  
  #endif
---- linux-2.6.19.noarch/drivers/media/video/Kconfig~	2006-12-12 09:57:45.000000000 -0500
-+++ linux-2.6.19.noarch/drivers/media/video/Kconfig	2006-12-12 09:57:59.000000000 -0500
-@@ -668,7 +668,7 @@ config VIDEO_M32R_AR_M64278
- 
- config VIDEO_CAFE_CCIC
- 	tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
--	depends on I2C && VIDEO_V4L2
-+	depends on I2C && VIDEO_V4L2 && X86
- 	select VIDEO_OV7670
- 	---help---
- 	  This is a video4linux2 driver for the Marvell 88ALP01 integrated
+
 
 drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices':
 drivers/macintosh/via-pmu.c:2014: error: implicit declaration of function 'pm_prepare_console'