]> git.pld-linux.org Git - packages/kernel.git/blob - kernel-small_fixes.patch
- xen update to 3.0.4
[packages/kernel.git] / kernel-small_fixes.patch
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
4 @@ -175,6 +175,12 @@
5                 .id     = SERIO_ANY,
6                 .extra  = SERIO_ANY,
7         },
8 +       {
9 +               .type   = SERIO_RS232,
10 +               .proto  = 0x1f, // Trust ForceFeedback Race Master
11 +               .id     = SERIO_ANY,
12 +               .extra  = SERIO_ANY,
13 +       },
14         { 0 }
15  };
16  
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
19 @@ -19,6 +19,7 @@
20  #include <linux/compiler.h>
21  #include <linux/time.h>
22  #include <linux/cache.h>
23 +#include <linux/ip.h>
24  
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
29 @@ -445,6 +445,10 @@
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)
32  
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
36 +
37  /* Enforce in-order execution of data I/O.
38   * No distinction between read/write on PPC; use eieio for all three.
39   */
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
42 @@ -58,6 +58,7 @@
43         struct tasklet_struct ciintf_irq_tasklet;
44         int slot_status;
45         struct dvb_ca_en50221 ca;
46 +       u8 reinitialise_demod:1;
47  };
48  
49  /* GPIO Connections:
50 @@ -214,8 +215,9 @@
51         while (--timeout > 0 && ciintf_read_attribute_mem(ca, slot, 0) != 0x1d)
52                 msleep(100);
53  
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);
59  
60         if (timeout <= 0)
61         {
62 @@ -1064,12 +1066,10 @@
63                 fe = tda10021_attach(&philips_cu1216_config,
64                                      &budget_av->budget.i2c_adap,
65                                      read_pwm(budget_av));
66 -               if (fe) {
67 -                       fe->ops.tuner_ops.set_params = philips_cu1216_tuner_set_params;
68 -               }
69                 break;
70  
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,
75                                      read_pwm(budget_av));
This page took 0.034811 seconds and 3 git commands to generate.