summaryrefslogtreecommitdiffstats
path: root/target/linux/x86/patches-3.2/001-alix_platform.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-07 21:56:51 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-07 21:56:51 +0000
commit4cca99b95fc7be5f90a94b5b41b45c5c32360a38 (patch)
treeed09a964ee9a382c0a1e108b0c418280054de14d /target/linux/x86/patches-3.2/001-alix_platform.patch
parent9b433b090a57ca648ca0e3eeb3ddc68136a7ccc7 (diff)
8139cp: backport patches to make driver stable again
List of patches that Jo-Philipp groveled out of git. Redux: defuzzed. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30366 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/patches-3.2/001-alix_platform.patch')
-rw-r--r--target/linux/x86/patches-3.2/001-alix_platform.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/x86/patches-3.2/001-alix_platform.patch b/target/linux/x86/patches-3.2/001-alix_platform.patch
index 21a5278cc..de7005b38 100644
--- a/target/linux/x86/patches-3.2/001-alix_platform.patch
+++ b/target/linux/x86/patches-3.2/001-alix_platform.patch
@@ -58,7 +58,7 @@ index dc5f1d3..a24bf8c 100644
static struct gpio_led alix_leds[] = {
{
.name = "alix:1",
-@@ -64,17 +106,22 @@ static struct platform_device alix_leds_
+@@ -64,17 +98,22 @@ static struct platform_device alix_leds_
.dev.platform_data = &alix_leds_data,
};
@@ -83,7 +83,7 @@ index dc5f1d3..a24bf8c 100644
const char *bios_virt;
const char *scan_end;
const char *p;
-@@ -109,7 +156,8 @@ static int __init alix_present(unsigned
+@@ -109,7 +148,8 @@ static int __init alix_present(unsigned
*a = '\0';
tail = p + alix_sig_len;
@@ -93,7 +93,7 @@ index dc5f1d3..a24bf8c 100644
printk(KERN_INFO
"%s: system is recognized as \"%s\"\n",
KBUILD_MODNAME, name);
-@@ -120,6 +169,24 @@ static int __init alix_present(unsigned
+@@ -120,6 +160,24 @@ static int __init alix_present(unsigned
return 0;
}
@@ -118,7 +118,7 @@ index dc5f1d3..a24bf8c 100644
static int __init alix_init(void)
{
const char tinybios_sig[] = "PC Engines ALIX.";
-@@ -128,8 +197,9 @@ static int __init alix_init(void)
+@@ -128,8 +186,9 @@ static int __init alix_init(void)
if (!is_geode())
return 0;