aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-01-05 23:49:37 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-01-05 23:49:37 +0000
commit31ed9f13df0f82666401219cf17d08d58b6bb8c0 (patch)
tree5e29c9cdb427d4114ba7f91d5c8470ce5fae8cf5
parent3a66d77a4bfb85d27ab656f212d4eb101c30ee22 (diff)
downloadbusybox-w32-31ed9f13df0f82666401219cf17d08d58b6bb8c0.tar.gz
busybox-w32-31ed9f13df0f82666401219cf17d08d58b6bb8c0.tar.bz2
busybox-w32-31ed9f13df0f82666401219cf17d08d58b6bb8c0.zip
Fix broken #else
git-svn-id: svn://busybox.net/trunk/busybox@8260 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--modutils/insmod.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 1895622de..5960b591d 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -282,7 +282,7 @@ extern int insmod_ng_main( int argc, char **argv);
282#ifndef MODUTILS_MODULE_H 282#ifndef MODUTILS_MODULE_H
283static const int MODUTILS_MODULE_H = 1; 283static const int MODUTILS_MODULE_H = 1;
284 284
285#ident "$Id: insmod.c,v 1.110 2003/12/31 23:20:10 bug1 Exp $" 285#ident "$Id: insmod.c,v 1.111 2004/01/05 23:49:37 andersen Exp $"
286 286
287/* This file contains the structures used by the 2.0 and 2.1 kernels. 287/* This file contains the structures used by the 2.0 and 2.1 kernels.
288 We do not use the kernel headers directly because we do not wish 288 We do not use the kernel headers directly because we do not wish
@@ -503,7 +503,7 @@ int delete_module(const char *);
503#ifndef MODUTILS_OBJ_H 503#ifndef MODUTILS_OBJ_H
504static const int MODUTILS_OBJ_H = 1; 504static const int MODUTILS_OBJ_H = 1;
505 505
506#ident "$Id: insmod.c,v 1.110 2003/12/31 23:20:10 bug1 Exp $" 506#ident "$Id: insmod.c,v 1.111 2004/01/05 23:49:37 andersen Exp $"
507 507
508/* The relocatable object is manipulated using elfin types. */ 508/* The relocatable object is manipulated using elfin types. */
509 509
@@ -4135,9 +4135,8 @@ extern int insmod_main( int argc, char **argv)
4135 if (k_version > 4) 4135 if (k_version > 4)
4136 bb_xasprintf(&m_fullName, "%s.ko", tmp); 4136 bb_xasprintf(&m_fullName, "%s.ko", tmp);
4137 else 4137 else
4138#else
4139 bb_xasprintf(&m_fullName, "%s.o", tmp);
4140#endif 4138#endif
4139 bb_xasprintf(&m_fullName, "%s.o", tmp);
4141 4140
4142 if (!m_name) { 4141 if (!m_name) {
4143 m_name = tmp; 4142 m_name = tmp;