diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
| commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
| tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /modutils | |
| parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
| parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
| download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip | |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/modinfo.c | 1 | ||||
| -rw-r--r-- | modutils/modutils-24.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/modutils/modinfo.c b/modutils/modinfo.c index 410b6fbe4..c0910ffed 100644 --- a/modutils/modinfo.c +++ b/modutils/modinfo.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | //config:config MODINFO | 13 | //config:config MODINFO |
| 14 | //config: bool "modinfo" | 14 | //config: bool "modinfo" |
| 15 | //config: default y | 15 | //config: default y |
| 16 | //config: select PLATFORM_LINUX | ||
| 16 | //config: help | 17 | //config: help |
| 17 | //config: Show information about a Linux Kernel module | 18 | //config: Show information about a Linux Kernel module |
| 18 | 19 | ||
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c index bbc54e316..12cb75c54 100644 --- a/modutils/modutils-24.c +++ b/modutils/modutils-24.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | 60 | ||
| 61 | #include "libbb.h" | 61 | #include "libbb.h" |
| 62 | #include "modutils.h" | 62 | #include "modutils.h" |
| 63 | #include <libgen.h> | ||
| 64 | #include <sys/utsname.h> | 63 | #include <sys/utsname.h> |
| 65 | 64 | ||
| 66 | #if ENABLE_FEATURE_INSMOD_LOADINKMEM | 65 | #if ENABLE_FEATURE_INSMOD_LOADINKMEM |