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