1 diff -Nur linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c
2 --- linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c 2006-03-05 19:07:54.000000000 +0000
3 +++ linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c 2006-04-29 23:17:59.000000000 +0000
10 + .proto = 0x1f, // Trust ForceFeedback Race Master
17 --- linux-2.6.17/include/linux/skbuff.h~ 2006-06-19 16:14:43.000000000 +0200
18 +++ linux-2.6.17/include/linux/skbuff.h 2006-06-19 16:57:47.000000000 +0200
20 #include <linux/compiler.h>
21 #include <linux/time.h>
22 #include <linux/cache.h>
23 +#include <linux/ip.h>
25 #include <asm/atomic.h>
26 #include <asm/types.h>
27 --- linux-2.6.17/include/asm-ppc/io.h~ 2006-06-18 01:49:35.000000000 +0000
28 +++ linux-2.6.17/include/asm-ppc/io.h 2006-06-22 02:44:19.000000000 +0000
30 #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
31 #define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET)
33 +#define isa_virt_to_bus virt_to_phys
34 +#define isa_page_to_bus page_to_phys
35 +#define isa_bus_to_virt phys_to_virt
37 /* Enforce in-order execution of data I/O.
38 * No distinction between read/write on PPC; use eieio for all three.
40 --- linux-2.6.17.7.orig/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 14:53:19.000000000 +0100
41 +++ linux-2.6.17.7/drivers/media/dvb/ttpci/budget-av.c 2006-07-25 15:25:32.000000000 +0100
43 struct tasklet_struct ciintf_irq_tasklet;
45 struct dvb_ca_en50221 ca;
46 + u8 reinitialise_demod:1;
51 while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
54 - /* reinitialise the frontend */
55 - dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
56 + /* reinitialise the frontend if necessary */
57 + if (budget_av->reinitialise_demod)
58 + dvb_frontend_reinitialise(budget_av->budget.dvb_frontend);
62 @@ -1064,12 +1066,10 @@
63 fe = tda10021_attach(&philips_cu1216_config,
64 &budget_av->budget.i2c_adap,
67 - fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
71 case SUBID_DVBC_KNC1_PLUS:
72 + budget_av->reinitialise_demod = 1;
73 fe = tda10021_attach(&philips_cu1216_config,
74 &budget_av->budget.i2c_adap,