From 61e09b313e58d999633029d8d840673dee2c94d9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Apr 2011 13:29:23 +0200 Subject: Revert "linux: move stale patches to /obsolete/linux" this breaks multikernel.inc This reverts commit 71eb55a998a150f3dc828d2478b7875f807b3536. --- recipes/linux/files/configs/.empty | 0 recipes/linux/files/ipaq-hal.init | 14 ++++++++++ recipes/linux/files/linux-2.6-limits.patch | 10 ++++++++ recipes/linux/files/usb-gadget-ether-compat.patch | 30 ++++++++++++++++++++++ recipes/obsolete/linux/files/configs/.empty | 0 recipes/obsolete/linux/files/ipaq-hal.init | 14 ---------- .../obsolete/linux/files/linux-2.6-limits.patch | 10 -------- .../linux/files/usb-gadget-ether-compat.patch | 30 ---------------------- 8 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 recipes/linux/files/configs/.empty create mode 100644 recipes/linux/files/ipaq-hal.init create mode 100644 recipes/linux/files/linux-2.6-limits.patch create mode 100644 recipes/linux/files/usb-gadget-ether-compat.patch delete mode 100644 recipes/obsolete/linux/files/configs/.empty delete mode 100644 recipes/obsolete/linux/files/ipaq-hal.init delete mode 100644 recipes/obsolete/linux/files/linux-2.6-limits.patch delete mode 100644 recipes/obsolete/linux/files/usb-gadget-ether-compat.patch diff --git a/recipes/linux/files/configs/.empty b/recipes/linux/files/configs/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/recipes/linux/files/ipaq-hal.init b/recipes/linux/files/ipaq-hal.init new file mode 100644 index 0000000000..4efb52ec97 --- /dev/null +++ b/recipes/linux/files/ipaq-hal.init @@ -0,0 +1,14 @@ +#!/bin/sh + +# make sure update-modules has been run +# since the calls below depend on aliases... +if [ ! -f /etc/modules.conf ]; then + update-modules || true +fi + +modprobe ipaq_hal || exit 0 + +if [ -d /proc/hal ]; then + model=`cat /proc/hal/model` + modprobe ipaq_hal_$model +fi diff --git a/recipes/linux/files/linux-2.6-limits.patch b/recipes/linux/files/linux-2.6-limits.patch new file mode 100644 index 0000000000..777a2fa671 --- /dev/null +++ b/recipes/linux/files/linux-2.6-limits.patch @@ -0,0 +1,10 @@ +--- linux/scripts/mod/sumversion.c.orig 2009-03-15 21:44:58.000000000 +0100 ++++ linux/scripts/mod/sumversion.c 2009-03-15 21:44:58.000000000 +0100 +@@ -8,6 +8,7 @@ + #include + #include + #include "modpost.h" ++#include + + /* + * Stolen form Cryptographic API. diff --git a/recipes/linux/files/usb-gadget-ether-compat.patch b/recipes/linux/files/usb-gadget-ether-compat.patch new file mode 100644 index 0000000000..9e336cfa3c --- /dev/null +++ b/recipes/linux/files/usb-gadget-ether-compat.patch @@ -0,0 +1,30 @@ +--- kernel/drivers/usb/gadget/ether.c 2005-04-24 12:40:08.867411535 +0200 ++++ /tmp/ether.c 2005-04-24 12:39:02.119093498 +0200 +@@ -231,6 +231,16 @@ + MODULE_PARM(host_addr, "s"); + MODULE_PARM_DESC(host_addr, "Host Ethernet Address"); + ++#ifdef CONFIG_USB_ETH_RNDIS ++/* setting it to 1 disables the RNDIS extension, ++ * needed to make g_ether compatible with usbnet from kernel < 2.6.10: ++ * - simple vendor/product ++ * - just the CDC interface ++ */ ++static u8 __initdata compat_mode; ++MODULE_PARM(compat_mode, "b"); ++MODULE_PARM_DESC(compat_mode, "non-zero value reverts to traditional usbnet compatibility (RNDIS disabled)"); ++#endif + + /*-------------------------------------------------------------------------*/ + +@@ -2336,6 +2346,10 @@ + #endif + #ifndef CONFIG_USB_ETH_RNDIS + rndis = 0; ++#else ++ if (compat_mode) { ++ rndis = 0; ++ } + #endif + + /* Because most host side USB stacks handle CDC Ethernet, that diff --git a/recipes/obsolete/linux/files/configs/.empty b/recipes/obsolete/linux/files/configs/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/recipes/obsolete/linux/files/ipaq-hal.init b/recipes/obsolete/linux/files/ipaq-hal.init deleted file mode 100644 index 4efb52ec97..0000000000 --- a/recipes/obsolete/linux/files/ipaq-hal.init +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# make sure update-modules has been run -# since the calls below depend on aliases... -if [ ! -f /etc/modules.conf ]; then - update-modules || true -fi - -modprobe ipaq_hal || exit 0 - -if [ -d /proc/hal ]; then - model=`cat /proc/hal/model` - modprobe ipaq_hal_$model -fi diff --git a/recipes/obsolete/linux/files/linux-2.6-limits.patch b/recipes/obsolete/linux/files/linux-2.6-limits.patch deleted file mode 100644 index 777a2fa671..0000000000 --- a/recipes/obsolete/linux/files/linux-2.6-limits.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux/scripts/mod/sumversion.c.orig 2009-03-15 21:44:58.000000000 +0100 -+++ linux/scripts/mod/sumversion.c 2009-03-15 21:44:58.000000000 +0100 -@@ -8,6 +8,7 @@ - #include - #include - #include "modpost.h" -+#include - - /* - * Stolen form Cryptographic API. diff --git a/recipes/obsolete/linux/files/usb-gadget-ether-compat.patch b/recipes/obsolete/linux/files/usb-gadget-ether-compat.patch deleted file mode 100644 index 9e336cfa3c..0000000000 --- a/recipes/obsolete/linux/files/usb-gadget-ether-compat.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- kernel/drivers/usb/gadget/ether.c 2005-04-24 12:40:08.867411535 +0200 -+++ /tmp/ether.c 2005-04-24 12:39:02.119093498 +0200 -@@ -231,6 +231,16 @@ - MODULE_PARM(host_addr, "s"); - MODULE_PARM_DESC(host_addr, "Host Ethernet Address"); - -+#ifdef CONFIG_USB_ETH_RNDIS -+/* setting it to 1 disables the RNDIS extension, -+ * needed to make g_ether compatible with usbnet from kernel < 2.6.10: -+ * - simple vendor/product -+ * - just the CDC interface -+ */ -+static u8 __initdata compat_mode; -+MODULE_PARM(compat_mode, "b"); -+MODULE_PARM_DESC(compat_mode, "non-zero value reverts to traditional usbnet compatibility (RNDIS disabled)"); -+#endif - - /*-------------------------------------------------------------------------*/ - -@@ -2336,6 +2346,10 @@ - #endif - #ifndef CONFIG_USB_ETH_RNDIS - rndis = 0; -+#else -+ if (compat_mode) { -+ rndis = 0; -+ } - #endif - - /* Because most host side USB stacks handle CDC Ethernet, that -- cgit 1.2.3-korg