]> git.pld-linux.org Git - packages/kernel.git/blob - kernel-small_fixes.patch
- merged from LINUX_2_6
[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.27/arch/powerpc/include/asm/io.h~ 2006-06-18 01:49:35.000000000 +0000
18 +++ linux-2.6.27/arch/powerpc/include/asm/io.h  2006-06-22 02:44:19.000000000 +0000
19 @@ -445,6 +445,10 @@
20  #define page_to_phys(page)     (page_to_pfn(page) << PAGE_SHIFT)
21  #define page_to_bus(page)      (page_to_phys(page) + PCI_DRAM_OFFSET)
22  
23 +#define isa_virt_to_bus virt_to_phys
24 +#define isa_page_to_bus page_to_phys
25 +#define isa_bus_to_virt phys_to_virt
26 +
27  /* Enforce in-order execution of data I/O.
28   * No distinction between read/write on PPC; use eieio for all three.
29   */
30 --- linux-2.6.20/drivers/media/common/ir-keymaps.c.orig 2007-02-04 19:44:54.000000000 +0100
31 +++ linux-2.6.20/drivers/media/common/ir-keymaps.c      2007-02-17 22:22:39.327414970 +0100
32 @@ -151,10 +151,6 @@
33  
34  IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
35  
36 -       [ 0x1e ] = KEY_POWER,       // power
37 -       [ 0x07 ] = KEY_MEDIA,       // source
38 -       [ 0x1c ] = KEY_SEARCH,      // scan
39 -
40  /* FIXME: duplicate keycodes?
41   *
42   * These four keys seem to share the same GPIO as CH+, CH-, <<< and >>>
43 @@ -175,14 +171,10 @@
44   */
45  
46         [ 0x03 ] = KEY_TUNER,       // TV/FM
47 +       [ 0x07 ] = KEY_SEARCH,      // scan
48 +       [ 0x1c ] = KEY_ZOOM,        // zoom
49  
50 -       [ 0x00 ] = KEY_RECORD,
51 -       [ 0x08 ] = KEY_STOP,
52 -       [ 0x11 ] = KEY_PLAY,
53 -
54 -       [ 0x1a ] = KEY_PLAYPAUSE,   // freeze
55 -       [ 0x19 ] = KEY_ZOOM,        // zoom
56 -       [ 0x0f ] = KEY_TEXT,        // min
57 +       [ 0x1e ] = KEY_POWER,       // power
58  
59         [ 0x01 ] = KEY_1,
60         [ 0x0b ] = KEY_2,
61 @@ -195,20 +187,22 @@
62         [ 0x12 ] = KEY_9,
63         [ 0x02 ] = KEY_0,
64         [ 0x10 ] = KEY_LAST,        // +100
65 -       [ 0x13 ] = KEY_LIST,        // recall
66 +       [ 0x13 ] = KEY_LIST,        // loop
67  
68 -       [ 0x1f ] = KEY_CHANNELUP,   // chn down
69 -       [ 0x17 ] = KEY_CHANNELDOWN, // chn up
70 -       [ 0x16 ] = KEY_VOLUMEUP,    // vol down
71 -       [ 0x14 ] = KEY_VOLUMEDOWN,  // vol up
72 +       [ 0x1f ] = KEY_VOLUMEUP,    // vol down
73 +       [ 0x17 ] = KEY_VOLUMEDOWN,  // vol up
74 +       [ 0x16 ] = KEY_CHANNELUP,   // chn down
75 +       [ 0x14 ] = KEY_CHANNELDOWN, // chn up
76  
77 -       [ 0x04 ] = KEY_KPMINUS,     // <<<
78 +       [ 0x00 ] = KEY_MEDIA,       // source
79 +       [ 0x18 ] = KEY_MUTE,        // mute/unmute
80 +
81 +       [ 0x04 ] = KEY_KPMINUS,     // -
82         [ 0x0e ] = KEY_SETUP,       // function
83 -       [ 0x0c ] = KEY_KPPLUS,      // >>>
84 +       [ 0x0c ] = KEY_KPPLUS,      // +
85  
86 -       [ 0x0d ] = KEY_GOTO,        // mts
87 -       [ 0x1d ] = KEY_REFRESH,     // reset
88 -       [ 0x18 ] = KEY_MUTE         // mute/unmute
89 +       [ 0x0d ] = KEY_REFRESH,     // reset
90 +       [ 0x0f ] = KEY_PLAYPAUSE    // freeze
91  };
92  
93  EXPORT_SYMBOL_GPL(ir_codes_pixelview);
94 --- linux-2.6.27/arch/powerpc/include/asm/suspend.h     2007-07-09 01:32:17.000000000 +0200
95 +++ linux-2.6.27/arch/powerpc/include/asm/suspend.h     2007-08-28 23:26:16.629658848 +0200
96 @@ -6,4 +6,7 @@
97  void save_processor_state(void);
98  void restore_processor_state(void);
99  
100 +#define suspend2_faulted (0)
101 +#define clear_suspend2_fault() do { } while(0)
102 +
103  #endif /* __ASM_POWERPC_SUSPEND_H */
104 --- linux-2.6.26/arch/powerpc/kernel/swsusp.c   2008-09-29 00:01:56.000000000 +0200
105 +++ linux-2.6.26/arch/powerpc/kernel/swsusp.c   2008-09-29 00:01:42.000000000 +0200
106 @@ -9,6 +9,7 @@
107   * 2 of the License, or (at your option) any later version.
108   */
109  
110 +#include <linux/module.h>
111  #include <linux/sched.h>
112  #include <asm/suspend.h>
113  #include <asm/system.h>
114 @@ -30,6 +31,7 @@
115  #endif
116  
117  }
118 +EXPORT_SYMBOL(save_processor_state);
119  
120  void restore_processor_state(void)
121  {
122
This page took 0.068257 seconds and 4 git commands to generate.