rpms/kernel/FC-4 kernel-2.6.spec, 1.1665, 1.1666 linux-2.6-compile-fixes.patch, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: davej

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

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


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1665
retrieving revision 1.1666
diff -u -r1.1665 -r1.1666
--- kernel-2.6.spec	28 Jul 2006 20:45:47 -0000	1.1665
+++ kernel-2.6.spec	29 Jul 2006 02:58:44 -0000	1.1666
@@ -719,7 +719,7 @@
 #
 # misc small stuff to make things compile or otherwise improve performance
 #
-#%patch10000 -p1
+%patch10000 -p1
 
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1

linux-2.6-compile-fixes.patch:
 budget-av.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-compile-fixes.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-compile-fixes.patch	9 Mar 2006 23:16:31 -0000	1.10
+++ linux-2.6-compile-fixes.patch	29 Jul 2006 02:58:45 -0000	1.11
@@ -0,0 +1,54 @@
+[PATCH 2.6.17.7] Fix budget-av compile failure
+
+From: Andrew de Quincey <adq_dvb at lidskialf.net>
+
+Currently I am doing lots of refactoring work in the dvb tree. This bugfix
+became necessary to fix 2.6.17 whilst I was in the middle of this work. 
+Unfortunately after I tested the original code for the patch, I generated 
+the diff against the wrong tree (I accidentally used a tree with part of 
+the refactoring code in it). This resulted in the reported compile errors 
+because that tree (a) was incomplete, and (b) used features which are 
+simply not in the mainline kernel yet.
+
+Many apologies for the error and problems this has caused. :(
+
+Signed-off-by: Andrew de Quincey <adq_dvb at lidskialf.net>
+Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
+
+diff -Naur linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c
+--- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 14:53:19.000000000 +0100
++++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c	2006-07-25 15:25:32.000000000 +0100
+@@ -58,6 +58,7 @@
+ 	struct tasklet_struct ciintf_irq_tasklet;
+ 	int slot_status;
+ 	struct dvb_ca_en50221 ca;
++	u8 reinitialise_demod:1;
+ };
+ 
+ /* GPIO Connections:
+@@ -214,8 +215,9 @@
+ 	while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
+ 		msleep(100);
+ 
+-	/* reinitialise the frontend */
+-	dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
++	/* reinitialise the frontend if necessary */
++	if (budget_av->reinitialise_demod)
++		dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
+ 
+ 	if (timeout <= 0)
+ 	{
+@@ -1064,12 +1066,10 @@
+ 		fe = tda10021_attach(&philips_cu1216_config,
+ 				     &budget_av->budget.i2c_adap,
+ 				     read_pwm(budget_av));
+-		if (fe) {
+-			fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
+-		}
+ 		break;
+ 
+ 	case SUBID_DVBC_KNC1_PLUS:
++		budget_av->reinitialise_demod = 1;
+ 		fe = tda10021_attach(&philips_cu1216_config,
+ 				     &budget_av->budget.i2c_adap,
+ 				     read_pwm(budget_av));