summaryrefslogtreecommitdiffstats
path: root/target/linux/leon/patches-2.6.36/025-greth_bootloader_disable_device_node.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-16 16:32:55 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-16 16:32:55 +0000
commit763c067152ac8f8acc6a4920bd335254435feb2b (patch)
tree2e0e2146effb547c681faed71e1cd042af250d90 /target/linux/leon/patches-2.6.36/025-greth_bootloader_disable_device_node.patch
parent8642151a3411335fe43e3b93ad1c867c1ed7b6d7 (diff)
[leon] move patches to patches-2.6.36
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34220 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/leon/patches-2.6.36/025-greth_bootloader_disable_device_node.patch')
-rw-r--r--target/linux/leon/patches-2.6.36/025-greth_bootloader_disable_device_node.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/leon/patches-2.6.36/025-greth_bootloader_disable_device_node.patch b/target/linux/leon/patches-2.6.36/025-greth_bootloader_disable_device_node.patch
new file mode 100644
index 000000000..836bab1fa
--- /dev/null
+++ b/target/linux/leon/patches-2.6.36/025-greth_bootloader_disable_device_node.patch
@@ -0,0 +1,25 @@
+From 66d5b37cc6d32291419bf99161e83e2946ea5f25 Mon Sep 17 00:00:00 2001
+From: Daniel Hellstrom <daniel@gaisler.com>
+Date: Wed, 1 Dec 2010 12:11:03 +0100
+Subject: [PATCH] GRETH: added option to disable a device node from bootloader.
+
+Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
+---
+ drivers/net/greth.c | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+--- a/drivers/net/greth.c
++++ b/drivers/net/greth.c
+@@ -1428,6 +1428,12 @@ static int __devinit greth_of_probe(stru
+ int err;
+ int tmp;
+ unsigned long timeout;
++ int *ampopts;
++
++ /* Skip device if used by another OS instance */
++ ampopts = (int *) of_get_property(ofdev->dev.of_node, "ampopts", NULL);
++ if (ampopts && (*ampopts == 0))
++ return -EIO;
+
+ dev = alloc_etherdev(sizeof(struct greth_private));
+