Author: blues Date: Mon Jul 31 14:21:01 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- taken from kernel-desktop (with one removed part)
---- Files affected:
SOURCES:
kernel-small_fixes.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/kernel-small_fixes.patch
diff -u /dev/null SOURCES/kernel-small_fixes.patch:1.1
--- /dev/null Mon Jul 31 16:21:01 2006
+++ SOURCES/kernel-small_fixes.patch Mon Jul 31 16:20:56 2006
@@ -0,0 +1,75 @@
+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
+--- linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c
2006-03-05 19:07:54.000000000 +0000
++++ linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c
2006-04-29 23:17:59.000000000 +0000
+@@ -175,6 +175,12 @@
+ .id = SERIO_ANY,
+ .extra = SERIO_ANY,
+ },
++ {
++ .type = SERIO_RS232,
++ .proto = 0x1f, // Trust ForceFeedback Race Master
++ .id = SERIO_ANY,
++ .extra = SERIO_ANY,
++ },
+ { 0 }
+ };
+
+--- linux-2.6.17/include/linux/skbuff.h~ 2006-06-19 16:14:43.000000000
+0200
++++ linux-2.6.17/include/linux/skbuff.h 2006-06-19 16:57:47.000000000
+0200
+@@ -19,6 +19,7 @@
+ #include <linux/compiler.h>
+ #include <linux/time.h>
+ #include <linux/cache.h>
++#include <linux/ip.h>
+
+ #include <asm/atomic.h>
+ #include <asm/types.h>
+--- linux-2.6.17/include/asm-ppc/io.h~ 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/include/asm-ppc/io.h 2006-06-22 02:44:19.000000000 +0000
+@@ -445,6 +445,10 @@
+ #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
+ #define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET)
+
++#define isa_virt_to_bus virt_to_phys
++#define isa_page_to_bus page_to_phys
++#define isa_bus_to_virt phys_to_virt
++
+ /* Enforce in-order execution of data I/O.
+ * No distinction between read/write on PPC; use eieio for all three.
+ */
+--- 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));
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
