summaryrefslogtreecommitdiff
path: root/linux/dev/drivers/block
diff options
context:
space:
mode:
authorJustus Winter <justus@gnupg.org>2016-02-25 18:46:32 +0100
committerJustus Winter <justus@gnupg.org>2016-02-25 18:46:32 +0100
commit9ad7eb46b65b7324dd5f2c6f5568b6a0e033a5f4 (patch)
treeaab92d03e843bcc7423124b2ec069ccb6be8e7e4 /linux/dev/drivers/block
parente7e91cc329b6a064d9703829911e940d7395d0a3 (diff)
70_dde.patch
Diffstat (limited to 'linux/dev/drivers/block')
-rw-r--r--linux/dev/drivers/block/genhd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/dev/drivers/block/genhd.c b/linux/dev/drivers/block/genhd.c
index 3a86138..4a36f7f 100644
--- a/linux/dev/drivers/block/genhd.c
+++ b/linux/dev/drivers/block/genhd.c
@@ -812,7 +812,9 @@ void device_setup(void)
#ifdef MACH
linux_intr_pri = SPL6;
#endif
- net_dev_init();
+ extern char *kernel_cmdline;
+ if (!strstr(kernel_cmdline, " nonetdev"))
+ net_dev_init();
#endif
#ifndef MACH
console_map_init();