From 3176285dda5ab8e7c6af5701df735701aa00433e Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Tue, 10 Jan 2006 23:13:09 +0000
Subject: [PATCH] [arm] Allow modules to be unloaded.

svn path=/dists/trunk/linux-2.6/; revision=5397
---
 debian/arch/arm/config            | 3 +++
 debian/arch/arm/config.footbridge | 3 ---
 debian/arch/arm/config.ixp4xx     | 2 --
 debian/arch/arm/config.rpc        | 3 ---
 debian/arch/arm/config.s3c2410    | 3 ---
 debian/changelog                  | 1 +
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/arch/arm/config b/debian/arch/arm/config
index f36a54ffd..a6dadadfe 100644
--- a/debian/arch/arm/config
+++ b/debian/arch/arm/config
@@ -20,3 +20,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_JBD=y
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_TMPFS=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge
index a2f252776..3d6140d72 100644
--- a/debian/arch/arm/config.footbridge
+++ b/debian/arch/arm/config.footbridge
@@ -47,9 +47,7 @@ CONFIG_BASE_SMALL=0
 # Loadable module support
 #
 CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
 CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 
@@ -1601,7 +1599,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_L2CAP=m
 # CONFIG_UFS_FS_WRITE is not set
 # CONFIG_TULIP_MWI is not set
-# CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_BT_BNEP=m
 CONFIG_MTD_CHAR=m
 CONFIG_PCMCIA_XIRTULIP=m
diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx
index 5227cc3e7..bdf8fdacd 100644
--- a/debian/arch/arm/config.ixp4xx
+++ b/debian/arch/arm/config.ixp4xx
@@ -47,9 +47,7 @@ CONFIG_BASE_SMALL=0
 # Loadable module support
 #
 CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
 CONFIG_OBSOLETE_MODPARM=y
-CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 
diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc
index f25ec44ea..1960d2eaf 100644
--- a/debian/arch/arm/config.rpc
+++ b/debian/arch/arm/config.rpc
@@ -49,10 +49,7 @@ CONFIG_BASE_SMALL=0
 # Loadable module support
 #
 CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 
diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410
index 806c91369..aca08d3e7 100644
--- a/debian/arch/arm/config.s3c2410
+++ b/debian/arch/arm/config.s3c2410
@@ -48,9 +48,7 @@ CONFIG_BASE_SMALL=0
 # Loadable module support
 #
 CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
 CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
 
@@ -1189,7 +1187,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_L2CAP=m
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_PPP_SYNC_TTY=m
-# CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_USB_MICROTEK=m
 CONFIG_BT_BNEP=m
 CONFIG_USB_USS720=m
diff --git a/debian/changelog b/debian/changelog
index 590415591..cc46a7cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ linux-2.6 (2.6.15-3) UNRELEASED; urgency=low
   * [arm] Activate tmpfs.
   * [arm] Activate the right network drivers on Footbridge (Tulip and
     NE2K).
+  * [arm] Allow modules to be unloaded.
 
  -- Martin Michlmayr <tbm@cyrius.com>  Tue, 10 Jan 2006 22:59:19 +0000