26 lines
789 B
Diff
26 lines
789 B
Diff
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));
|
|
|