summaryrefslogtreecommitdiffstats
path: root/package/busybox/busybox-1.12.1-modprobe.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-11-02 13:06:44 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-11-02 13:06:44 +0000
commita2274077d97f7f1d5c5a5b28a044dbc012169d4b (patch)
treef9814439402bbd0ef3402a7101ae1cf00fa8e327 /package/busybox/busybox-1.12.1-modprobe.patch
parent0138389b0b211312215fdd70c652d62cf6765edf (diff)
downloadbuildroot-novena-a2274077d97f7f1d5c5a5b28a044dbc012169d4b.tar.gz
buildroot-novena-a2274077d97f7f1d5c5a5b28a044dbc012169d4b.zip
busybox: additional 1.12.1 patches
Diffstat (limited to 'package/busybox/busybox-1.12.1-modprobe.patch')
-rw-r--r--package/busybox/busybox-1.12.1-modprobe.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/busybox/busybox-1.12.1-modprobe.patch b/package/busybox/busybox-1.12.1-modprobe.patch
index 02be10745..a305c008c 100644
--- a/package/busybox/busybox-1.12.1-modprobe.patch
+++ b/package/busybox/busybox-1.12.1-modprobe.patch
@@ -1,7 +1,7 @@
-diff -urN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
+diff -urpN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
--- busybox-1.12.1/modutils/modprobe.c 2008-09-28 20:04:15.000000000 +0200
+++ busybox-1.12.1-modprobe/modutils/modprobe.c 2008-10-10 14:36:58.000000000 +0200
-@@ -263,9 +263,9 @@
+@@ -263,9 +263,9 @@ static int FAST_FUNC include_conf_dir_ac
return TRUE;
}
@@ -13,7 +13,7 @@ diff -urN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/mo
include_conf_file_act,
include_conf_dir_act,
conf, 1);
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ static int FAST_FUNC include_conf_file_a
char *includefile;
includefile = skip_whitespace(line_buffer + 8);
@@ -22,7 +22,7 @@ diff -urN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/mo
} else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
(is_conf_command(line_buffer, "blacklist"))) {
char *mod;
-@@ -559,7 +559,7 @@
+@@ -559,7 +559,7 @@ static struct dep_t *build_dep(void)
if (ENABLE_FEATURE_2_6_MODULES) {
if (include_conf_file(&conf, "/etc/modprobe.conf"))
r = TRUE;