- rel 1; works on x86_64

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index ca6ce13c5963272236f42807d9423ba12360539a..28517b8ba73a02d99c71733dc738dde08270f500 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -1,57 +1,29 @@
---- 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.33/scripts/mod/modpost.c~        2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100
+@@ -15,7 +15,8 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include "modpost.h"
+-#include "../../include/generated/autoconf.h"
++// PLD architectures don't use CONFIG_SYMBOL_PREFIX
++//#include "../../include/generated/autoconf.h"
+ #include "../../include/linux/license.h"
  
---- linux-2.6.27/arch/powerpc/include/asm/io.h~        2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.27/arch/powerpc/include/asm/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.27/arch/powerpc/include/asm/suspend.h    2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.27/arch/powerpc/include/asm/suspend.h    2007-08-28 23:26:16.629658848 +0200
-@@ -6,4 +6,7 @@
- void save_processor_state(void);
- void restore_processor_state(void);
- 
-+#define suspend2_faulted (0)
-+#define clear_suspend2_fault() do { } while(0)
-+
- #endif /* __ASM_POWERPC_SUSPEND_H */
---- linux-2.6.26/arch/powerpc/kernel/swsusp.c  2008-09-29 00:01:56.000000000 +0200
-+++ linux-2.6.26/arch/powerpc/kernel/swsusp.c  2008-09-29 00:01:42.000000000 +0200
-@@ -9,6 +9,7 @@
-  * 2 of the License, or (at your option) any later version.
-  */
- 
-+#include <linux/module.h>
- #include <linux/sched.h>
- #include <asm/suspend.h>
- #include <asm/system.h>
-@@ -30,6 +31,7 @@
- #endif
- 
- }
-+EXPORT_SYMBOL(save_processor_state);
- 
- void restore_processor_state(void)
- {
+ /* Some toolchains use a `_' prefix for all user symbols. */
+
+--- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~      2011-07-22 04:17:23.000000000 +0200
++++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh       2011-08-25 21:26:04.799150642 +0200
+@@ -9,6 +9,12 @@
+                       $cc -print-file-name=lib${lib}.${ext} | grep -q /
+                       if [ $? -eq 0 ]; then
+                               echo "-l${lib}"
++                              for libt in tinfow tinfo ; do
++                                      $cc -print-file-name=lib${libt}.${ext} | grep -q /
++                                      if [ $? -eq 0 ]; then
++                                              echo "-l${libt}"
++                                      fi
++                              done
+                               exit
+                       fi
+               done