Force BB_FEATURE_NEW_MODULE_INTERFACE and BB_FEATURE_OLD_MODULE_INTERFACE

to be mutually exclusive (stable branch)

diff --git a/busybox/insmod.c b/busybox/insmod.c
index 6765f82d62b4cff07225468f741decd22f3d80fd..413af5ce76b419aabaf1cf57f6cab73d208593bf 100644 (file)
--- a/busybox/insmod.c
+++ b/busybox/insmod.c
@@ -67,6 +67,7 @@
 #include "busybox.h"
 
 #ifdef BB_FEATURE_NEW_MODULE_INTERFACE
+# undef BB_FEATURE_OLD_MODULE_INTERFACE
 # define new_sys_init_module   init_module
 #else
 # define old_sys_init_module   init_module
@@ -133,8 +134,6 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
-
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
    to be dependant on a particular kernel version to compile insmod.  */
@@ -350,8 +349,6 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
-
 /* The relocatable object is manipulated using elfin types.  */
 
 #include <stdio.h>

diff --git a/busybox/modutils/insmod.c b/busybox/modutils/insmod.c
index 6765f82d62b4cff07225468f741decd22f3d80fd..413af5ce76b419aabaf1cf57f6cab73d208593bf 100644 (file)
--- a/busybox/modutils/insmod.c
+++ b/busybox/modutils/insmod.c
@@ -67,6 +67,7 @@
 #include "busybox.h"
 
 #ifdef BB_FEATURE_NEW_MODULE_INTERFACE
+# undef BB_FEATURE_OLD_MODULE_INTERFACE
 # define new_sys_init_module   init_module
 #else
 # define old_sys_init_module   init_module
@@ -133,8 +134,6 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
-
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
    to be dependant on a particular kernel version to compile insmod.  */
@@ -350,8 +349,6 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.70.2.2 2001/08/22 05:29:19 andersen Exp $"
-
 /* The relocatable object is manipulated using elfin types.  */
 
 #include <stdio.h>