summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-08-22 05:41:57 +0000
committerEric Andersen2001-08-22 05:41:57 +0000
commit1071ccfd25ec2c218c9d87da98282620e5356626 (patch)
tree6e00fa282f46ce7d4e379f63d51c7e112ac2634c
parentc0f9d0dce7a4d1ef1b2fd19f98fc0ec94c3887e4 (diff)
downloadbusybox-1071ccfd25ec2c218c9d87da98282620e5356626.zip
busybox-1071ccfd25ec2c218c9d87da98282620e5356626.tar.gz
Force BB_FEATURE_NEW_MODULE_INTERFACE and BB_FEATURE_OLD_MODULE_INTERFACE
to be mutually exclusive
-rw-r--r--insmod.c5
-rw-r--r--modutils/insmod.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/insmod.c b/insmod.c
index 34be00b..6b81ca7 100644
--- a/insmod.c
+++ b/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,7 +134,7 @@
#ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $"
+#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 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
@@ -350,7 +351,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $"
+#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 34be00b..6b81ca7 100644
--- a/modutils/insmod.c
+++ b/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,7 +134,7 @@
#ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $"
+#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 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
@@ -350,7 +351,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.72 2001/08/22 05:26:08 andersen Exp $"
+#ident "$Id: insmod.c,v 1.73 2001/08/22 05:41:57 andersen Exp $"
/* The relocatable object is manipulated using elfin types. */