Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
[vuplus_openembedded] / packages / linux / linux-dm800 / linux-2.6.12-dream-misc.patch
1 diff -Naur 2.6.12-5.0-org/arch/mips/kernel/reset.c 2.6.12-5.0-patched/arch/mips/kernel/reset.c
2 --- 2.6.12-5.0-org/arch/mips/kernel/reset.c     2007-07-26 00:51:08.000000000 +0200
3 +++ 2.6.12-5.0-patched/arch/mips/kernel/reset.c 2007-12-11 12:34:52.000000000 +0100
4 @@ -27,6 +27,7 @@
5  }
6  
7  EXPORT_SYMBOL(machine_restart);
8 +EXPORT_SYMBOL(_machine_restart);
9  
10  void machine_halt(void)
11  {
12 @@ -34,6 +35,7 @@
13  }
14  
15  EXPORT_SYMBOL(machine_halt);
16 +EXPORT_SYMBOL(_machine_halt);
17  
18  void machine_power_off(void)
19  {
20 @@ -41,3 +43,4 @@
21  }
22  
23  EXPORT_SYMBOL(machine_power_off);
24 +EXPORT_SYMBOL(_machine_power_off);
25 diff -Naur 2.6.12-5.0-org/drivers/video/Kconfig 2.6.12-5.0-patched/drivers/video/Kconfig
26 --- 2.6.12-5.0-org/drivers/video/Kconfig        2007-07-26 00:54:49.000000000 +0200
27 +++ 2.6.12-5.0-patched/drivers/video/Kconfig    2007-12-11 12:34:52.000000000 +0100
28 @@ -39,7 +39,7 @@
29           device-aware may cause unexpected results. If unsure, say N.
30  
31  config FB_CFB_FILLRECT
32 -       tristate
33 +       tristate "FB_CFB_FILLRECT"
34         depends on FB
35         default n
36         ---help---
37 @@ -48,7 +48,7 @@
38           (accelerated) version.
39  
40  config FB_CFB_COPYAREA
41 -       tristate
42 +       tristate "FB_CFB_COPYAREA"
43         depends on FB
44         default n
45         ---help---
46 @@ -57,7 +57,7 @@
47           version.
48  
49  config FB_CFB_IMAGEBLIT
50 -       tristate
51 +       tristate "FB_CFB_IMAGEBLIT"
52         depends on FB
53         default n
54         ---help---
55 @@ -66,7 +66,7 @@
56           (accelerated) version.
57  
58  config FB_SOFT_CURSOR
59 -       tristate
60 +       tristate "FB_SOFT_CURSOR"
61         depends on FB
62         default n
63         ---help---
64 diff -Naur 2.6.12-5.0-org/drivers/char/keyboard.c 2.6.12-5.0-patched/drivers/char/keyboard.c
65 --- 2.6.12-5.0-org/drivers/char/keyboard.c      2007-07-26 00:53:29.000000000 +0200
66 +++ 2.6.12-5.0-patched/drivers/char/keyboard.c  2007-12-11 12:34:52.000000000 +0100
67 @@ -1186,6 +1186,9 @@
68         for (i = KEY_RESERVED; i < BTN_MISC; i++)
69                 if (test_bit(i, dev->keybit)) break;
70  
71 +       if ( test_bit(EV_NO_CONSOLE, dev->evbit) )
72 +               return NULL;
73 +
74         if ((i == BTN_MISC) && !test_bit(EV_SND, dev->evbit)) 
75                 return NULL;
76  
77 diff -Naur 2.6.12-5.0-org/include/linux/input.h 2.6.12-5.0-patched/include/linux/input.h
78 --- 2.6.12-5.0-org/include/linux/input.h        2007-07-26 00:56:59.000000000 +0200
79 +++ 2.6.12-5.0-patched/include/linux/input.h    2007-12-11 12:34:52.000000000 +0100
80 @@ -92,6 +92,7 @@
81  #define EV_FF                  0x15
82  #define EV_PWR                 0x16
83  #define EV_FF_STATUS           0x17
84 +#define EV_NO_CONSOLE          0x1e
85  #define EV_MAX                 0x1f
86  
87  /*