diff options
| author | John Lee <john_lee@openmoko.org> | 2008-02-27 07:50:52 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2008-02-27 07:50:52 +0000 |
| commit | d6f3635f2e2baa680d878461fc8fa9b68c51162b (patch) | |
| tree | a07627fc6746f21a02a543381681f1cb1320b38d /packages/busybox/busybox-1.01/rmmod.patch | |
| parent | b14906e8fa695a85b9ddf27838c959be1c8a5fad (diff) | |
| parent | 9d22cb8106117d2d923bf7b2c263bf9e31b5305f (diff) | |
merge of '8dccbf106093aaa7b62b2a96962945185534c923'
and 'c50825ba187c292f591cf43c91216cebffb5e290'
Diffstat (limited to 'packages/busybox/busybox-1.01/rmmod.patch')
| -rw-r--r-- | packages/busybox/busybox-1.01/rmmod.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/packages/busybox/busybox-1.01/rmmod.patch b/packages/busybox/busybox-1.01/rmmod.patch deleted file mode 100644 index 5a557ef35d..0000000000 --- a/packages/busybox/busybox-1.01/rmmod.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: modutils/rmmod.c -=================================================================== -RCS file: /var/cvs/busybox/modutils/rmmod.c,v -retrieving revision 1.31 -diff -u -r1.31 rmmod.c ---- busybox/modutils/rmmod.c 20 Jul 2004 18:36:51 -0000 1.31 -+++ busybox/modutils/rmmod.c 10 Dec 2004 22:56:36 -0000 -@@ -28,6 +28,7 @@ - #include <fcntl.h> - #include <string.h> - #include <sys/syscall.h> -+#include <sys/utsname.h> - #include "busybox.h" - - #ifdef CONFIG_FEATURE_2_6_MODULES -@@ -63,6 +64,16 @@ - void *buf; /* hold the module names which we ignore but must get */ - size_t bufsize = 0; - #endif -+#ifdef CONFIG_FEATURE_2_6_MODULES -+ int k_version = 0; -+ struct utsname myuname; -+ -+ if (uname(&myuname) == 0) { -+ if (myuname.release[0] == '2') { -+ k_version = myuname.release[2] - '0'; -+ } -+ } -+#endif - - /* Parse command line. */ - while ((n = getopt(argc, argv, "a")) != EOF) { -@@ -109,7 +120,10 @@ - for (n = optind; n < argc; n++) { - #ifdef CONFIG_FEATURE_2_6_MODULES - char module_name[strlen(argv[n]) + 1]; -- filename2modname(module_name, argv[n]); -+ if (k_version != 4) -+ filename2modname(module_name, argv[n]); -+ else -+ strcpy(module_name, argv[n]); - #else - #define module_name argv[n] - #endif |