move package description to a separate definition, remove it when DESCRIPTION=TITLE

SVN-Revision: 8659
2007-09-07 08:34:51 +00:00 · 2007-09-07 08:34:51 +00:00 · 34bb4638e7
commit 34bb4638e7
parent 3e2f44481f
65 changed files with 1235 additions and 686 deletions
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@ -27,15 +27,16 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/acx
  TITLE:=Driver for TI ACX1xx chipset
  DEPENDS:=@LINUX_2_6 @!TARGET_AVR32 +wireless-tools
-  DESCRIPTION:=\
-	This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
  URL:=http://acx100.sourceforge.net/
  SUBMENU:=Wireless Drivers
-  FILES:= \
-		$(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
+  FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,acx)
 endef

+define KernelPackage/acx/description
+ This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
+endef
+
 define Build/Compile
 	$(MAKE) -C $(LINUX_DIR) \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
--- a/package/admswconfig/Makefile
+++ b/package/admswconfig/Makefile
@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$

 include $(TOPDIR)/rules.mk

@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@openwrt/
 PKG_MD5SUM:=faafd4618f970119a665b11b21ac6a26

-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk

 define Package/admswconfig
@ -25,14 +23,16 @@ define Package/admswconfig
  CATEGORY:=Utilities
  TITLE:=ADM5120 Switch configuration tool
  DEPENDS:=@TARGET_ADM5120||TARGET_ADM5120EB
-  DESCRIPTION:=\
-	A program to configure the internal ethernet switch of an ADM5120 processor. \\\
-	You need the corresponding driver for the switch in the kernel. \\\
-	with this program you can configure which ports of the switch belong \\\
-	to the different ethernet devices.
  URL:=http://sharon.esrac.ele.tue.nl/users/pe1rxq/linux-adm/admswconfig/
 endef

+define Package/admswconfig/description
+ A program to configure the internal ethernet switch of an ADM5120 processor.
+ You need the corresponding driver for the switch in the kernel. 
+ With this program you can configure which ports of the switch belong 
+ to the different ethernet devices.
+endef
+
 define Build/Configure
 endef

--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@ -23,7 +23,6 @@ define KernelPackage/alsa
  SUBMENU:=Other modules
  DEPENDS:=@USB_SUPPORT @LINUX_2_4
  TITLE:=Advanced Linux Sound Architecture
-  DESCRIPTION:=
  FILES:=$(PKG_BUILD_DIR)/modules/*.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD=$(call AutoLoad,70,$(shell cat ./files/alsa.modules))
 endef
--- a/package/aodv-uu/Makefile
+++ b/package/aodv-uu/Makefile
@ -21,33 +21,39 @@ include $(INCLUDE_DIR)/package.mk

 define Package/aodv-uu/Default
  TITLE:=Ad-hoc On-demand Distance Vector Routing
-  DESCRIPTION:=\
-  	AODV is the Ad-hoc On-demand Distance Vector routing protocol \\\
-  	implementation created at Uppsala University.
  URL:=http://core.it.uu.se/core/index.php/AODV-UU
 endef

+define Package/aodv-uu/Default/description
+ AODV is the Ad-hoc On-demand Distance Vector routing protocol 
+ implementation created at Uppsala University.
+endef
+
 define Package/aodv-uu
 $(call Package/aodv-uu/Default)
  SECTION:=net
  CATEGORY:=Network
  TITLE+= (daemon)
-  DESCRIPTION+=\\\
-  	\\\
+endef
+
+define Package/aodv-uu/description
+$(call Package/aodv-uu/Default/description)
 This package contains the AODV userland daemon.
 endef

 define KernelPackage/aodv-uu
 $(call Package/aodv-uu/Default)
  TITLE+= (kernel module)
-  DESCRIPTION+=\\\
-  	\\\
-  	This package contains the AODV kernel module.
  FILES:=$(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX)
  SUBMENU:=Network Support
  AUTOLOAD:=$(call AutoLoad,80,$(shell cat ./files/aodv-uu.modules))
 endef

+define KernelPackage/aodv-uu/description
+$(call Package/aodv-uu/Default/description)
+ This package contains the AODV kernel module.
+endef
+
 ifeq ($(CONFIG_LINUX_2_6),y)
  define Build/Compile/linux26
 	$(MAKE) -C $(LINUX_DIR) \
--- a/package/ar7-atm/Makefile
+++ b/package/ar7-atm/Makefile
@ -19,19 +19,30 @@ PKG_MD5SUM:=dc4d5c36532503a2f234f3303a0bf563

 include $(INCLUDE_DIR)/package.mk

-define KernelPackage/sangam-atm-annex-a
+define KernelPackage/sangam-atm/Default
  SUBMENU:=Network Devices
  DEPENDS:=@TARGET_AR7 +kmod-atm 
-  TITLE:=AR7 ADSL driver (Annex A, ADSL over POTS)
-  DESCRIPTION:=The AR7 ADSL driver for Annex A (ADSL over POTS)
+  TITLE:=AR7 ADSL driver
  FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,tiatm)
 endef

+define KernelPackage/sangam-atm-annex-a
+$(call KernelPackage/sangam-atm/Default)
+  TITLE+= (Annex A, ADSL over POTS)
+endef
+
+define KernelPackage/sangam-atm-annex-a/description
+ The AR7 ADSL driver for Annex A (ADSL over POTS).
+endef
+
 define KernelPackage/sangam-atm-annex-b
-  $(call KernelPackage/sangam-atm-annex-a)
-  TITLE:=AR7 ADSL driver (Annex B, ADSL over ISDN)
-  DESCRIPTION:=The AR7 ADSL driver for Annex B (ADSL over ISDN)
+$(call KernelPackage/sangam-atm/Default)
+  TITLE+= (Annex B, ADSL over ISDN)
+endef
+
+define KernelPackage/sangam-atm-annex-b/description
+ The AR7 ADSL driver for Annex B (ADSL over ISDN).
 endef

 define Build/Compile
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@ -34,8 +34,6 @@ define Package/base-files$(TARGET)
  SECTION:=base
  CATEGORY:=Base system
  TITLE:=Base filesystem for OpenWrt
-  DESCRIPTION:=\
-	This package contains a base filesystem and system scripts for OpenWrt.
  URL:=http://openwrt.org/
  VERSION:=$(PKG_RELEASE)-$(REV)
  $(call Config,network.lan.proto,string,static,LAN Protocol)
@ -58,6 +56,10 @@ define Package/base-files$(TARGET)/conffiles
 $(call $(TARGET)/conffiles)
 endef

+define Package/base-files$(TARGET)/description
+ This package contains a base filesystem and system scripts for OpenWrt.
+endef
+
 define Package/gcc/Default
  SECTION:=libs
  CATEGORY:=Base system
--- a/package/bcm43xx-mac80211/Makefile
+++ b/package/bcm43xx-mac80211/Makefile
@ -20,13 +20,16 @@ endif
 define KernelPackage/bcm43xx-mac80211
  SUBMENU:=Wireless Drivers
  TITLE:=Broadcom 43xx wireless support
-  DESCRIPTION:=Kernel module for Broadcom 43xx wireless support (mac80211)
  DEPENDS:=@TARGET_BRCM47XX +kmod-mac80211
  KCONFIG:=CONFIG_MAC80211
  FILES:=$(PKG_BUILD_DIR)/bcm43xx-mac80211.$(LINUX_KMOD_SUFFIX)
 #  AUTOLOAD:=$(call AutoLoad,30,bcm43xx-mac80211)
 endef

+define KernelPackage/bcm43xx-mac80211/description
+ Kernel module for Broadcom 43xx wireless support (mac80211)
+endef
+
 ifneq ($(CONFIG_MAC80211),)

  PKG_EXTRA_KCONFIG:= \
--- a/package/br2684ctl/Makefile
+++ b/package/br2684ctl/Makefile
@ -25,7 +25,6 @@ define Package/$(PKG_NAME)
  SECTION:=net
  CATEGORY:=Base system
  TITLE:=ATM Ethernet bridging configuration utility
-  DESCRIPTION:=ATM Ethernet bridging configuration utility
  URL:=http://ftp.debian.org/debian/pool/main/b/br2684ctl
 endef

--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@ -17,19 +17,23 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/bridge
 PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd

+include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk

 define Package/bridge
  SECTION:=net
  CATEGORY:=Base system
  TITLE:=Ethernet bridging configuration utility
-  DESCRIPTION:=\
-	Manage ethernet bridging: a way to connect networks together to \\\
-	form a larger network.
  URL:=http://bridge.sourceforge.net/
 endef

-CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
+define Package/bridge/description
+ Manage ethernet bridging: a way to connect networks together to 
+ form a larger network.
+endef
+
+CONFIGURE_ARGS += \
+	--with-linux-headers="$(LINUX_DIR)" \

 define Package/bridge/install
 	$(INSTALL_DIR) $(1)/usr/sbin
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@ -33,38 +33,50 @@ define KernelPackage/brcm-wl/Default
  SECTION:=kernel
  DEPENDS:=@TARGET_BRCM_2_4
  TITLE:=Kernel driver for BCM43xx chipsets
-  DESCRIPTION:=\
-	This package contains the proprietary wireless driver for the Broadcom \\\
-	BCM43xx chipset
  FILES:=$(PKG_BUILD_DIR)/kmod/wl$(1).o
  AUTOLOAD:=$(call AutoLoad,30,wl$(1))
 endef

+define KernelPackage/brcm-wl/Default/description
+ This package contains the proprietary wireless driver for the Broadcom 
+ BCM43xx chipset.
+endef
+
 define KernelPackage/brcm-wl
 $(call KernelPackage/brcm-wl/Default,)
  TITLE+= (normal version)
-  DESCRIPTION+= (normal version).
+endef
+
+define KernelPackage/brcm-wl/description
+$(call KernelPackage/brcm-wl/Default/description)
 endef

 define KernelPackage/brcm-wl-mimo
 $(call KernelPackage/brcm-wl/Default,_mimo)
  TITLE+= (MIMO version)
-  DESCRIPTION+= (MIMO version).
+endef
+
+define KernelPackage/brcm-wl-mimo/description
+$(call KernelPackage/brcm-wl/Default/description)
 endef

 define Package/wlc
 $(call Package/broadcom-wl/Default)
  TITLE:=wl driver setup utility
-  DESCRIPTION:=\
-	This package contains an utility for initializing the proprietary Broadcom \\\
+endef
+
+define Package/wlc/description
+ This package contains an utility for initializing the proprietary Broadcom 
 wl driver.
 endef

 define Package/wl
 $(call Package/broadcom-wl/Default)
  TITLE:=Proprietary Broadcom wl driver config utility
-  DESCRIPTION:=\
-	This package contains the proprietary utility (wl) for configuring the \\\
+endef
+
+define Package/wl/description
+ This package contains the proprietary utility (wl) for configuring the 
 proprietary Broadcom wl driver.
 endef

@ -72,8 +84,10 @@ define Package/nas
 $(call Package/broadcom-wl/Default)
  DEPENDS+= +nvram
  TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
-  DESCRIPTION:=\
-	This package contains the proprietary WPA/WPA2 authenticator (nas) for the \\\
+endef
+
+define Package/nas/description
+ This package contains the proprietary WPA/WPA2 authenticator (nas) for the 
 proprietary Broadcom wl driver.
 endef

--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@ -25,12 +25,14 @@ define Package/comgt
  CATEGORY:=Utilities
  TITLE:=Option/Vodafone 3G/GPRS control tool
  DEPENDS:=+chat
-  DESCRIPTION:=\
-	comgt is a scripting language interpreter useful for establishing communications \\\
-	on serial lines and through PCMCIA modems as well as GPRS and 3G datacards.
  URL:= http://www.pharscape.org/content/view/46/70/
 endef

+define Package/comgt/description
+ comgt is a scripting language interpreter useful for establishing 
+ communications on serial lines and through PCMCIA modems as well as GPRS 
+ and 3G datacards.
+endef

 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@ -60,4 +62,3 @@ define Package/comgt/install
 endef

 $(eval $(call BuildPackage,comgt))
-
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@ -22,8 +22,6 @@ define Package/dnsmasq
  SECTION:=net
  CATEGORY:=Base system
  TITLE:=A lightweight DNS and DHCP server
-  DESCRIPTION:=\
-	It is intended to provide coupled DNS and DHCP service to a LAN.
  URL:=http://www.thekelleys.org.uk/dnsmasq/
 endef

@ -31,6 +29,10 @@ define Package/dnsmasq/conffiles
 /etc/dnsmasq.conf
 endef

+define Package/dnsmasq/description
+ It is intended to provide coupled DNS and DHCP service to a LAN.
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@ -28,7 +28,9 @@ define Package/dropbear
  SECTION:=net
  CATEGORY:=Base system
  TITLE:=Small SSH2 client/server
-  DESCRIPTION:=\
+endef
+
+define Package/dropbear/description
 A small SSH2 server/client designed for small memory environments.
 endef

--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@ -18,7 +18,12 @@ PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6

 include $(INCLUDE_DIR)/package.mk

+define Package/e2fsprogs/Default
+  URL:=http://e2fsprogs.sourceforge.net/
+endef
+
 define Package/e2fsprogs
+$(call Package/e2fsprogs/Default)
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=Ext2/3 filesystem utilities
@ -29,36 +34,44 @@ define Package/e2fsprogs
 	filesystem utilities.
 endef

+define Package/e2fsprogs/description
+ This package contains essential ext2 filesystem utilities which consists of 
+ e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 
+ filesystem utilities.
+endef
+
 define Package/libuuid
+$(call Package/e2fsprogs/Default)
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=DCE compatible Universally Unique Identifier library
-  DESCRIPTION:=\
-		Library for generating DCE compatible Universally Unique Identifiers
-  URL:=http://e2fsprogs.sourceforge.net/
+endef
+
+define Package/libuuid/description
+ Library for generating DCE compatible Universally Unique Identifiers.
 endef

 define Package/libblkid
+$(call Package/e2fsprogs/Default)
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=block device id library
-  DESCRIPTION:=\
-  	The blkid library which allows system programs like fsck and mount to quickly\\\
-	and easily find block devices by filesystem UUID and LABEL.
-  URL:=http://e2fsprogs.sourceforge.net/
+endef
+
+define Package/libblkid/description
+ The blkid library which allows system programs like fsck and mount to 
+ quickly and easily find block devices by filesystem UUID and LABEL.
 endef

 define Package/tune2fs
 $(call Package/e2fsprogs)
  TITLE:=Ext2 Filesystem tune utility
-  DESCRIPTION:=Ext2 Filesystem tune utility
  DEPENDS:=e2fsprogs
 endef

 define Package/resize2fs
 $(call Package/e2fsprogs)
  TITLE:=Ext2 Filesystem resize utility
-  DESCRIPTION:=Ext2 Filesystem resize utility
  DEPENDS:=e2fsprogs
 endef

@ -119,7 +132,7 @@ define Package/libuuid/install
 endef

 define Package/libblkid/install
-	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/
 endef

--- a/package/fonera-mp3-drv/Makefile
+++ b/package/fonera-mp3-drv/Makefile
@ -20,11 +20,14 @@ define KernelPackage/fonera-mp3-driver
  SUBMENU:=Other modules
  DEPENDS:=@TARGET_ATHEROS
  TITLE:=Fonera-MP3 driver (VS1011X)
-  DESCRIPTION:=driver for a vs1011X attached to a fonera
  FILES:=$(PKG_BUILD_DIR)/mp3_drv.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,25,mp3-drv)
 endef

+define KernelPackage/fonera-mp3-driver/description
+ This package a kernel driver for a vs1011X attached to a fonera.
+endef
+
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(CP) -r src/* $(PKG_BUILD_DIR)/
--- a/package/fonera-mp3/Makefile
+++ b/package/fonera-mp3/Makefile
@ -21,10 +21,12 @@ define Package/fonera-mp3d
  CATEGORY:=Utilities
  DEPENDS:=@TARGET_ATHEROS
  TITLE:=Daemon for fonera-mp3
-  DESCRIPTION:=Daemon to drive a vs1011X mp3 decoder attached to the \
-	  fonera gpio pins
 endef

+define Package/fonera-mp3d/description
+ Daemon to drive a vs1011X mp3 decoder attached to the 
+ fonera gpio pins
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
--- a/package/foxboard-utils/Makefile
+++ b/package/foxboard-utils/Makefile
@ -24,12 +24,15 @@ define Package/foxboard-utils
  SECTION:=utils
  CATEGORY:=Base system
  TITLE:=Foxboard base tools
-  DESCRIPTION:=\
-	This package contains a collection of tools for configuring the foxboard gpio pins/leds 
  URL:=http://www.acmesystems.it
  DEPENDS:=@TARGET_ETRAX
 endef

+define Package/foxboard-utils/description
+ This package contains a collection of tools for configuring the foxboard 
+ gpio pins/leds.
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) CFLAGS=$(TARTGET_CFLAGS) CC=$(TARGET_CC) 
 	$(MAKE) -C $(PKG_BUILD_DIR) PREFIX="$(PKG_INSTALL_DIR)" install
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@ -22,42 +22,50 @@ include $(INCLUDE_DIR)/package.mk
 define Package/fuse/Default
  TITLE:=FUSE
  DEPENDS:=@LINUX_2_6
-  DESCRIPTION:=\
-	FUSE (Filesystem in UserSpacE)
  URL:=http://fuse.sourceforge.net/
 endef

+define Package/fuse/Default/description
+ FUSE (Filesystem in UserSpacE)
+endef
+
 define Package/fuse-utils
 $(call Package/fuse/Default)
  SECTION:=utils
  CATEGORY:=Utilities
  DEPENDS:=+libfuse +kmod-fuse @LINUX_2_6
  TITLE+= (utilities)
-  DESCRIPTION+=\\\
-	\\\
+endef
+
+define Package/fuse-utils/description
+$(call Package/fuse/Default/description)
 This package contains the FUSE utilities.
 endef

 define KernelPackage/fuse
-  SUBMENU:=Filesystems
 $(call Package/fuse/Default)
+  SUBMENU:=Filesystems
  DEPENDS:=@LINUX_2_6
  TITLE+= (kernel module)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the FUSE kernel module.
  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,80,fuse)
 endef

+define Kernel/Package/fuse/description
+$(call Package/fuse/Default/description)
+ This package contains the FUSE kernel module.
+endef
+
 define Package/libfuse
 $(call Package/fuse/Default)
  SECTION:=libs
  CATEGORY:=Libraries
  DEPENDS:=@LINUX_2_6
  TITLE+= (library)
-  DESCRIPTION+=\\\
-	\\\
+endef
+
+define Package/libfuse/description
+$(call Package/fuse/Default/description)
 This package contains the FUSE shared library, needed by other programs.
 endef

--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@ -20,7 +20,10 @@ define Package/gdbserver
  CATEGORY:=Utilities
  DEPENDS:=@GDB@
  TITLE:=Remote Server for the GNU Debugger
-  DESCRIPTION:=GDBSERVER is a program that allows you to run GDB on a different machine\\\
+endef
+
+define Package/gdbserver/description
+ GDBSERVER is a program that allows you to run GDB on a different machine 
 than the one which is running the program being debugged.
 endef

--- a/package/hostap-driver/Makefile
+++ b/package/hostap-driver/Makefile
@ -29,26 +29,22 @@ define KernelPackage/hostap/Default/2.6
  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
 endef
 define KernelPackage/hostap/Default
-  SUBMENU:=Wireless Drivers
-  DESCRIPTION:=\
-	Host AP is a driver for 802.11b wireless cards based on Intersil \\\
-	Prism2/2.5/3 chipset. It supports so called Host AP mode that allows the \\\
-	card to act as an IEEE 802.11 access point.
-  URL:=http://hostap.epitest.fi/
 $(call KernelPackage/hostap/Default/$(KERNEL))
+  SUBMENU:=Wireless Drivers
+  URL:=http://hostap.epitest.fi/
 endef

+define KernelPackage/hostap/Default/description
+ Host AP is a driver for 802.11b wireless cards based on Intersil 
+ Prism2/2.5/3 chipset. It supports so called Host AP mode that allows the 
+ card to act as an IEEE 802.11 access point.
+endef

 define KernelPackage/hostap
 $(call KernelPackage/hostap/Default)
  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-ieee80211 +kmod-crypto
  TITLE:=Host AP support for Prism2/2.5/3
  KCONFIG:=CONFIG_HOSTAP
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the base Host AP driver code that is shared by \\\
-	different hardware models. You will also need to enable support for \\\
-	PLX/PCI/CS version of the driver to actually use the driver.
 endef
 define KernelPackage/hostap/2.4
  DEPENDS:=+kmod-crypto
@ -65,15 +61,18 @@ define KernelPackage/hostap/2.6
  AUTOLOAD:=$(call AutoLoad,60,hostap)
 endef

+define KernelPackage/hostap/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the base Host AP driver code that is shared by 
+ different hardware models. You will also need to enable support for 
+ PLX/PCI/CS version of the driver to actually use the driver.
+endef

 define KernelPackage/hostap-pci
 $(call KernelPackage/hostap/Default)
  DEPENDS:=kmod-hostap
  TITLE:=Host AP driver for PCI adaptors
  KCONFIG:=CONFIG_HOSTAP_PCI
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the Host AP driver for Prism2.5 PCI adaptors.
  AUTOLOAD:=$(call AutoLoad,60,hostap_pci)
 endef
 define KernelPackage/hostap-pci/2.4
@ -85,16 +84,16 @@ define KernelPackage/hostap-pci/2.6
 	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/hostap-pci/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2.5 PCI adaptors.
+endef

 define KernelPackage/hostap-plx
 $(call KernelPackage/hostap/Default)
  DEPENDS:=kmod-hostap
  KCONFIG:=CONFIG_HOSTAP_PLX
  TITLE:=Host AP driver for PLX9052 based PCI adaptors
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 \\\
-	based PCI adaptors.
  AUTOLOAD:=$(call AutoLoad,60,hostap_plx)
 endef
 define KernelPackage/hostap-plx/2.4
@ -106,6 +105,12 @@ define KernelPackage/hostap-plx/2.6
 	$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/hostap-plx/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 
+ based PCI adaptors.
+endef
+

 ifeq ($(KERNEL),2.4)
  define Build/Compile
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@ -38,34 +38,40 @@ define Package/hostapd
 $(call Package/hostapd/Default)
  DEPENDS:=+libopenssl @!TARGET_AVR32 @!TARGET_ETRAX
  TITLE+= (full)
-  DESCRIPTION:=\
-	This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
-	Authenticator.
 endef

 define Package/hostapd/conffiles
 /etc/hostapd.conf
 endef

+define Package/hostapd/description
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS 
+ Authenticator.
+endef
+
 define Package/hostapd-mini
 $(call Package/hostapd/Default)
  DEPENDS:=@!TARGET_AVR32 @!TARGET_ETRAX
  TITLE+= (WPA-PSK only)
-  DESCRIPTION:=\
-	This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
-	(WPA-PSK only).
 endef

 define Package/hostapd-mini/conffiles
 /etc/hostapd.conf
 endef

+define Package/hostapd-mini/description
+ This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator 
+ (WPA-PSK only).
+endef
+
 define Package/hostapd-utils
  $(call Package/hostapd/Default)
  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
  TITLE+= (utils)
-  DESCRIPTION:=\
-	This package contains a command line utility to control the \\\
+endef
+
+define Package/hostapd-utils/description
+ This package contains a command line utility to control the 
 IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef

--- a/package/hotplug2/Makefile
+++ b/package/hotplug2/Makefile
@ -30,6 +30,7 @@ define Package/hotplug2/description
 Hotplug2 is a trivial replacement of some of the UDev functionality
 in a tiny pack, intended for Linux early userspace: Init RAM FS and InitRD.
 endef
+
 MAKE_FLAGS += CFLAGS="$(TARGET_CFLAGS) -DHAVE_RULES -I."

 define Package/hotplug2/install
--- a/package/ifenslave/Makefile
+++ b/package/ifenslave/Makefile
@ -19,11 +19,14 @@ define Package/ifenslave
  CATEGORY:=Network
  DEPENDS:=@LINUX_2_6 +kmod-bonding
  TITLE:=A utility to manipulate kernel ethernet bonding devices
-  DESCRIPTION:=ifenslave is needed to add/remove interfaces to/from ethernet bond devices
  VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
  URL:=http://www.kernel.org
 endef

+define Package/ifenslave/description
+ ifenslave is needed to add/remove interfaces to/from ethernet bond devices.
+endef
+
 define Build/Prepare
 endef

--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@ -15,6 +15,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 PKG_MD5SUM:=7bc5883aadf740761fa2dd70b661e8cc
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute-$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@ -48,12 +48,13 @@ define Package/iptables-mod-conntrack
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-conntrack
  TITLE:=connection tracking modules
-  DESCRIPTION:=\
-	iptables extensions for connection tracking.\\\
-	\\\
-	Includes: \\\
-	- libipt_conntrack \\\
-	- libipt_helper \\\
+endef
+
+define Package/iptables-mod-conntrack/description
+ iptables extensions for connection tracking.
+ Includes:
+ - libipt_conntrack
+ - libipt_helper
 - libipt_connmark/CONNMARK
 endef

@ -61,11 +62,12 @@ define Package/iptables-mod-filter
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-filter
  TITLE:=filter modules
-  DESCRIPTION:=\
-	iptables extensions for packet content inspection.\\\
-	\\\
-	Includes: \\\
-	- libipt_ipp2p \\\
+endef
+
+define Package/iptables-mod-filter/description
+ iptables extensions for packet content inspection.
+ Includes: 
+ - libipt_ipp2p
 - libipt_layer7 
 endef

@ -73,10 +75,11 @@ define Package/iptables-mod-imq
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-imq
  TITLE:=IMQ support
-  DESCRIPTION:=\
-	iptables extension for IMQ support.\\\
-	\\\
-	Includes: \\\
+endef
+
+define Package/iptables-mod-imq/description
+ iptables extension for IMQ support.
+ Includes: 
 - libipt_IMQ
 endef

@ -84,18 +87,19 @@ define Package/iptables-mod-ipopt
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-ipopt
  TITLE:=IP/Packet option modules
-  DESCRIPTION:=\
+endef
+
+define Package/iptables-mod-ipopt/description
 iptables extensions for matching/changing IP packet options.\\\
-	\\\
-	Includes: \\\
-	- libipt_CLASSIFY \\\
-	- libipt_dscp/DSCP \\\
-	- libipt_ecn/ECN \\\
-	- libipt_length \\\
-	- libipt_mac \\\
-	- libipt_tos/TOS \\\
-	- libipt_tcpmms \\\
-	- libipt_ttl/TTL \\\
+ Includes: 
+ - libipt_CLASSIFY
+ - libipt_dscp/DSCP
+ - libipt_ecn/ECN
+ - libipt_length
+ - libipt_mac
+ - libipt_tos/TOS
+ - libipt_tcpmms
+ - libipt_ttl/TTL
 - libipt_unclean 
 endef

@ -103,11 +107,12 @@ define Package/iptables-mod-ipsec
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-ipsec
  TITLE:=IPSec extensions
-  DESCRIPTION:=\
-	iptables extensions for matching ipsec traffic.\\\
-	\\\
-	Includes: \\\
-	- libipt_ah \\\
+endef
+
+define Package/iptables-mod-ipsec/description
+ iptables extensions for matching ipsec traffic.
+ Includes: 
+ - libipt_ah
 - libipt_esp
 endef

@ -115,10 +120,11 @@ define Package/iptables-mod-nat
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-nat
  TITLE:=extra NAT targets
-  DESCRIPTION:=\
-	iptables extensions for different NAT targets.\\\
-	\\\
-	Includes: \\\
+endef
+
+define Package/iptables-mod-nat/description
+ iptables extensions for different NAT targets.
+ Includes: 
 - libipt_REDIRECT
 endef

@ -126,10 +132,11 @@ define Package/iptables-mod-ulog
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-ulog
  TITLE:=user-space packet logging
-  DESCRIPTION:=\
-	iptables extensions for user-space packet logging.\\\
-	\\\
-	Includes: \\\
+endef
+
+define Package/iptables-mod-ulog/description
+ iptables extensions for user-space packet logging.
+ Includes: 
 - libipt_ULOG
 endef

@ -137,10 +144,11 @@ define Package/iptables-mod-iprange
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-iprange
  TITLE:=ip range module
-  DESCRIPTION:=\
-	iptables extensions for matching ip ranges.\\\
-	\\\
-	Includes: \\\
+endef
+
+define Package/iptables-mod-iprange/description
+ iptables extensions for matching ip ranges.
+ Includes: 
 - libipt_iprange
 endef

@ -148,15 +156,16 @@ define Package/iptables-mod-extra
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-extra
  TITLE:=other extra iptables extensions
-  DESCRIPTION:=\
-	other extra iptables extensions.\\\
-	\\\
-	Includes: \\\
-	- libipt_limit \\\
-	- libipt_owner \\\
-	- libipt_physdev \\\
-	- libipt_pkttype \\\
-	- libipt_recent \\\
+endef
+
+define Package/iptables-mod-extra/description
+ other extra iptables extensions.
+ Includes: 
+ - libipt_limit
+ - libipt_owner
+ - libipt_physdev
+ - libipt_pkttype
+ - libipt_recent
 - libipt_NOTRACK
 endef

@ -164,8 +173,6 @@ define Package/iptables-mod-ipset
 $(call Package/iptables/Default)
  DEPENDS:=iptables +kmod-ipt-ipset
  TITLE:=ipset iptables extension
-  DESCRIPTION:=\
-    ipset
 endef

 define Package/iptables-utils
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@ -37,7 +37,6 @@ define Package/kernel
  CATEGORY:=Kernel
  DEFAULT:=y
  TITLE:=Virtual kernel package
-  DESCRIPTION:=Virtual kernel package
  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
 endef

--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@ -3,13 +3,6 @@ BLMENU:=Block Devices
 define KernelPackage/ide-core
  SUBMENU:=$(BLMENU)
  TITLE:=Kernel support for IDE
-  DESCRIPTION:=\
-	Useful for usb mass storage devices (e.g. on WL-HDD)\\\
-	\\\
-	Includes: \\\
-	- ide-core \\\
-	- ide-detect \\\
-	- ide-disk
  KCONFIG:= \
 	CONFIG_IDE \
 	CONFIG_BLK_DEV_IDE \
@ -31,6 +24,14 @@ define KernelPackage/ide-core/2.6
  AUTOLOAD+=$(call AutoLoad,30,ide-generic)
 endef

+define KernelPackage/ide-core/description
+ Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
+ Includes:
+ - ide-core
+ - ide-detect
+ - ide-disk
+endef
+
 $(eval $(call KernelPackage,ide-core))


@ -87,24 +88,30 @@ $(eval $(call KernelPackage,libata))
 define KernelPackage/ata-piix
  SUBMENU:=$(BLMENU)
  TITLE:=ata-piix
-  DESCRIPTION:=Kernel module for Intel PIIX SATA controller
  DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
  KCONFIG:=CONFIG_ATA_PIIX
  FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,41,ata_piix)
 endef

+define KernelPackage/ata-piix/description
+ Kernel module for Intel PIIX SATA controller
+endef
+
 $(eval $(call KernelPackage,ata-piix))


 define KernelPackage/pata-artop
  SUBMENU:=$(BLMENU)
  TITLE:=pata-artop
-  DESCRIPTION:=Kernel module for ARTOP PATA controller
  DEPENDS:=+kmod-libata +kmod-scsi-core
  KCONFIG:=CONFIG_PATA_ARTOP
  FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,41,pata_artop)
 endef

+define KernelPackage/pata-artop/description
+ Kernel module for ARTOP PATA controller
+endef
+
 $(eval $(call KernelPackage,pata-artop))
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@ -9,7 +9,6 @@ endef
 define KernelPackage/fs-cifs
  SUBMENU:=$(FSMENU)
  TITLE:=CIFS support
-  DESCRIPTION:=Kernel module for CIFS support
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_CIFS
  FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
@ -18,49 +17,61 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/fs-cifs/description
+ Kernel module for CIFS support
+endef
+
 $(eval $(call KernelPackage,fs-cifs))


 define KernelPackage/fs-minix
  SUBMENU:=$(FSMENU)
  TITLE:=Minix filesystem support
-  DESCRIPTION:=Kernel module for Minix filesystem support
  KCONFIG:=CONFIG_MINIX_FS
  FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,minix)
 endef

+define KernelPackage/fs-minix/description
+ Kernel module for Minix filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-minix))


 define KernelPackage/fs-ntfs
  SUBMENU:=$(FSMENU)
  TITLE:=NTFS filesystem support
-  DESCRIPTION:=Kernel module for NTFS filesystem support
  KCONFIG:=CONFIG_NTFS_FS
  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,ntfs)
 endef

+define KernelPackage/fs-ntfs/description
+ Kernel module for NTFS filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-ntfs))


 define KernelPackage/fs-ext2
  SUBMENU:=$(FSMENU)
  TITLE:=EXT2 filesystem support
-  DESCRIPTION:=Kernel module for EXT2 filesystem support
  KCONFIG:=CONFIG_EXT2_FS
  FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,ext2)
 endef

+define KernelPackage/fs-ext2/description
+ Kernel module for EXT2 filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-ext2))


 define KernelPackage/fs-ext3
  SUBMENU:=$(FSMENU)
  TITLE:=EXT3 filesystem support
-  DESCRIPTION:=Kernel module for EXT3 filesystem support
  KCONFIG:= \
 	CONFIG_EXT3_FS \
 	CONFIG_JBD
@ -70,13 +81,16 @@ define KernelPackage/fs-ext3
  AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
 endef

+define KernelPackage/fs-ext3/description
+ Kernel module for EXT3 filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-ext3))


 define KernelPackage/fs-hfs
  SUBMENU:=$(FSMENU)
  TITLE:=HFS+ filesystem support
-  DESCRIPTION:=Kernel module for HFS filesystem support
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_HFS_FS
  FILES:=$(LINUX_DIR)/fs/hfs/hfs.$(LINUX_KMOD_SUFFIX)
@ -84,13 +98,16 @@ define KernelPackage/fs-hfs
 $(call KernelPackage/nls/Depends)
 endef

+define KernelPackage/fs-hfs/description
+ Kernel module for HFS filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-hfs))


 define KernelPackage/fs-hfsplus
  SUBMENU:=$(FSMENU)
  TITLE:=HFS+ filesystem support
-  DESCRIPTION:=Kernel module for HFS+ filesystem support
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_HFSPLUS_FS
  FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)
@ -99,13 +116,16 @@ $(call KernelPackage/nls/Depends,utf8)
 endef


+define KernelPackage/fs-hfsplus/description
+ Kernel module for HFS+ filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-hfsplus))


 define KernelPackage/fs-isofs
  SUBMENU:=$(FSMENU)
  TITLE:=ISO9660 filesystem support
-  DESCRIPTION:=Kernel module for ISO9660 filesystem support
  KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
  FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,isofs)
@ -113,13 +133,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/fs-isofs/description
+ Kernel module for ISO9660 filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-isofs))


 define KernelPackage/fs-udf
  SUBMENU:=$(FSMENU)
  TITLE:=UDF filesystem support
-  DESCRIPTION:=Kernel module for UDF filesystem support
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_UDF_FS
  FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
@ -128,13 +151,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/fs-udf/description
+ Kernel module for UDF filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-udf))


 define KernelPackage/fs-nfs
  SUBMENU:=$(FSMENU)
  TITLE:=NFS filesystem support
-  DESCRIPTION:=Kernel module for NFS support
  KCONFIG:= \
 	CONFIG_NFS_FS \
 	CONFIG_LOCKD \
@ -146,13 +172,16 @@ define KernelPackage/fs-nfs
  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
 endef

+define KernelPackage/fs-nfs/description
+ Kernel module for NFS support
+endef
+
 $(eval $(call KernelPackage,fs-nfs))


 define KernelPackage/fs-nfsd
  SUBMENU:=$(FSMENU)
  TITLE:=NFS kernel server support
-  DESCRIPTION:=Kernel module for NFS kernel server support
  KCONFIG:=CONFIG_NFSD
  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,nfsd)
@ -164,13 +193,16 @@ define KernelPackage/fs-nfsd/2.6
  AUTOLOAD+=$(call AutoLoad,30,exportfs)
 endef

+define KernelPackage/fs-nfsd/description
+ Kernel module for NFS kernel server support
+endef
+
 $(eval $(call KernelPackage,fs-nfsd))


 define KernelPackage/fs-msdos
  SUBMENU:=$(FSMENU)
  TITLE:=MSDOS filesystem support
-  DESCRIPTION:=Kernel module for MSDOS filesystem support
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_MSDOS_FS
  FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
@ -179,13 +211,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/fs-msdos/description
+ Kernel module for MSDOS filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-msdos))


 define KernelPackage/fs-vfat
  SUBMENU:=$(FSMENU)
  TITLE:=VFAT filesystem support
-  DESCRIPTION:=Kernel module for VFAT filesystem support
  KCONFIG:= \
 	CONFIG_FAT_FS \
 	CONFIG_VFAT_FS
@ -197,37 +232,46 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/fs-vfat/description
+ Kernel module for VFAT filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-vfat))


 define KernelPackage/fs-xfs
  SUBMENU:=$(FSMENU)
  TITLE:=XFS filesystem support
-  DESCRIPTION:=Kernel module for XFS support
  KCONFIG:=CONFIG_XFS_FS
  FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,xfs)
 endef

+define KernelPackage/fs-xfs/description
+ Kernel module for XFS support
+endef
+
 $(eval $(call KernelPackage,fs-xfs))


 define KernelPackage/nls-base
  SUBMENU:=$(FSMENU)
  TITLE:=Native Language Support
-  DESCRIPTION:=Kernel module for Native Language Support
  KCONFIG:=CONFIG_NLS
  FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,20,nls_base)
 endef

+define KernelPackage/nls-base/description
+ Kernel module for NLS (Native Language Support)
+endef
+
 $(eval $(call KernelPackage,nls-base))


 define KernelPackage/nls-cp437
  SUBMENU:=$(FSMENU)
  TITLE:=Codepage 437 (United States, Canada)
-  DESCRIPTION:=Kernel module for NLS Codepage 437 (United States, Canada)
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_CODEPAGE_437
  FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
@ -236,13 +280,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/nls-cp437/description
+ Kernel module for NLS Codepage 437 (United States, Canada)
+endef
+
 $(eval $(call KernelPackage,nls-cp437))


 define KernelPackage/nls-cp850
  SUBMENU:=$(FSMENU)
  TITLE:=Codepage 850 (Europe)
-  DESCRIPTION:=Kernel module for NLS Codepage 850 (Europe)
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_CODEPAGE_850
  FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
@ -251,13 +298,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/nls-cp850/description
+ Kernel module for NLS Codepage 850 (Europe)
+endef
+
 $(eval $(call KernelPackage,nls-cp850))


 define KernelPackage/nls-cp1250
  SUBMENU:=$(FSMENU)
  TITLE:=Codepage 1250 (Eastern Europe)
-  DESCRIPTION:=Kernel module for NLS Codepage 1250 (Eastern Europe)
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_CODEPAGE_1250
  FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX)
@ -266,13 +316,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/nls-cp1250/description
+ Kernel module for NLS Codepage 1250 (Eastern Europe)
+endef
+
 $(eval $(call KernelPackage,nls-cp1250))


 define KernelPackage/nls-iso8859-1
  SUBMENU:=$(FSMENU)
  TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
-  DESCRIPTION:=Kernel module for ISO 8859-1 (Latin 1)
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_ISO8859_1
  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
@ -281,13 +334,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/nls-iso8859-1/description
+ Kernel module for NLS ISO 8859-1 (Latin 1)
+endef
+
 $(eval $(call KernelPackage,nls-iso8859-1))


 define KernelPackage/nls-iso8859-2
  SUBMENU:=$(FSMENU)
  TITLE:=ISO 8859-2 (Latin 2; Central European Languages)
-  DESCRIPTION:=Kernel module for ISO 8859-2 (Latin 2)
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_ISO8859_2
  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX)
@ -296,13 +352,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/nls-iso8859-2/description
+ Kernel module for NLS ISO 8859-2 (Latin 2)
+endef
+
 $(eval $(call KernelPackage,nls-iso8859-2))


 define KernelPackage/nls-iso8859-15
  SUBMENU:=$(FSMENU)
  TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
-  DESCRIPTION:=Kernel module for ISO 8859-15 (Latin 9)
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_ISO8859_15
  FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
@ -311,13 +370,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/nls-iso8859-15/description
+ Kernel module for NLS ISO 8859-15 (Latin 9)
+endef
+
 $(eval $(call KernelPackage,nls-iso8859-15))


 define KernelPackage/nls-koi8r
  SUBMENU:=$(FSMENU)
  TITLE:=KOI8-R (Russian)
-  DESCRIPTION:=Kernel module for KOI8-R (Russian)
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_KOI8_R
  FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
@ -326,13 +388,16 @@ $(call KernelPackage/nls/Depends)
 endef


+define KernelPackage/nls-koi8r/description
+ Kernel module for NLS KOI8-R (Russian)
+endef
+
 $(eval $(call KernelPackage,nls-koi8r))


 define KernelPackage/nls-utf8
  SUBMENU:=$(FSMENU)
-  TITLE:=UTF8
-  DESCRIPTION:=Kernel module for NLS UTF8
+  TITLE:=UTF-8
  DEPENDS:=+kmod-nls-base
  KCONFIG:=CONFIG_NLS_UTF8
  FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
@ -340,5 +405,8 @@ define KernelPackage/nls-utf8
 $(call KernelPackage/nls/Depends)
 endef

+define KernelPackage/nls-utf8/description
+ Kernel module for NLS UTF-8
+endef

 $(eval $(call KernelPackage,nls-utf8))
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@ -11,7 +11,6 @@ I2CMENU:=I2C Bus
 define KernelPackage/i2c-core
  SUBMENU:=$(I2CMENU)
  TITLE:=I2C support
-  DESCRIPTION:=Kernel modules for i2c support
  DEPENDS:=@LINUX_2_6
  KCONFIG:= \
 	CONFIG_I2C \
@ -22,13 +21,16 @@ define KernelPackage/i2c-core
  AUTOLOAD:=$(call AutoLoad,50,i2c-core i2c-dev)
 endef

+define KernelPackage/i2c-core/description
+ Kernel modules for I2C support
+endef
+
 $(eval $(call KernelPackage,i2c-core))


 define KernelPackage/i2c-algos
  SUBMENU:=$(I2CMENU)
  TITLE:=I2C algorithms support
-  DESCRIPTION:=Kernel modules for various i2c algorithms
  DEPENDS:=kmod-i2c-core
  KCONFIG:= \
 	CONFIG_I2C_ALGOBIT \
@ -41,13 +43,16 @@ define KernelPackage/i2c-algos
  AUTOLOAD:=$(call AutoLoad,60,i2c-algo-bit i2c-algo-pcf i2c-algo-pca)
 endef

+define KernelPackage/i2c-algos/description
+ Kernel modules for various I2C algorithms
+endef
+
 $(eval $(call KernelPackage,i2c-algos))


 define KernelPackage/i2c-scx200
  SUBMENU:=$(I2CMENU)
  TITLE:=SCX200 i2c support
-  DESCRIPTION:=Kernel module for SCX200 i2c bus
  DEFAULT:=y if LINUX_2_6_X86_Soekris
  DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_X86_Soekris
  KCONFIG:= \
@ -59,4 +64,8 @@ define KernelPackage/i2c-scx200
  AUTOLOAD:=$(call AutoLoad,70,i2c-isa scx200_i2c)
 endef

+define KernelPackage/i2c-scx200/description
+ Kernel module for SCX200 I2C bus
+endef
+
 $(eval $(call KernelPackage,i2c-scx200))
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@ -12,268 +12,290 @@ include $(INCLUDE_DIR)/netfilter.mk
 define KernelPackage/ipt-conntrack
  SUBMENU:=$(NFMENU)
  TITLE:=Modules for connection tracking
-  DESCRIPTION:=\
-	Netfilter (IPv4) kernel modules for connection tracking\\\
-	\\\
-	Includes: \\\
-	- ipt_conntrack \\\
-	- ipt_helper \\\
-	- ipt_connmark/CONNMARK
  KCONFIG:=$(KCONFIG_IPT_CONNTRACK)
  FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CONNTRACK-m)))
 endef

+define KernelPackage/ipt-conntrack/description
+ Netfilter (IPv4) kernel modules for connection tracking
+ Includes: 
+ - ipt_conntrack 
+ - ipt_helper 
+ - ipt_connmark/CONNMARK
+endef
+
 $(eval $(call KernelPackage,ipt-conntrack))


 define KernelPackage/ipt-filter
  SUBMENU:=$(NFMENU)
  TITLE:=Modules for packet content inspection
-  DESCRIPTION:=\
-	Netfilter (IPv4) kernel modules for packet content inspection \\\
-	\\\
-	Includes: \\\
-	- ipt_ipp2p \\\
-	- ipt_layer7
  KCONFIG:=$(KCONFIG_IPT_FILTER)
  FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_FILTER-m)))
 endef

+define KernelPackage/ipt-filter/description
+ Netfilter (IPv4) kernel modules for packet content inspection 
+ Includes: 
+ - ipt_ipp2p 
+ - ipt_layer7
+endef
+
 $(eval $(call KernelPackage,ipt-filter))


 define KernelPackage/ipt-ipopt
  SUBMENU:=$(NFMENU)
  TITLE:=Modules for matching/changing IP packet options
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for matching/changing IP packet options \\\
-	\\\
-	Includes: \\\
-	- ipt_CLASSIFY \\\
-	- ipt_dscp/DSCP \\\
-	- ipt_ecn/ECN \\\
-	- ipt_length \\\
-	- ipt_mac \\\
-	- ipt_tos/TOS \\\
-	- ipt_tcpmms \\\
-	- ipt_ttl/TTL \\\
-	- ipt_unclean
  KCONFIG:=$(KCONFIG_IPT_IPOPT)
  FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPOPT-m)))
 endef

+define KernelPackage/ipt-ipopt/description
+ Netfilter (IPv4) modules for matching/changing IP packet options 
+ Includes: 
+ - ipt_CLASSIFY 
+ - ipt_dscp/DSCP 
+ - ipt_ecn/ECN 
+ - ipt_length 
+ - ipt_mac 
+ - ipt_tos/TOS 
+ - ipt_tcpmms 
+ - ipt_ttl/TTL 
+ - ipt_unclean
+endef
+
 $(eval $(call KernelPackage,ipt-ipopt))


 define KernelPackage/ipt-ipsec
  SUBMENU:=$(NFMENU)
  TITLE:=Modules for matching IPSec packets
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for matching IPSec packets \\\
-	\\\
-	Includes: \\\
-	- ipt_ah \\\
-	- ipt_esp
  KCONFIG:=$(KCONFIG_IPT_IPSEC)
  FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSEC-m)))
 endef

+define KernelPackage/ipt-ipsec/description
+ Netfilter (IPv4) modules for matching IPSec packets 
+ Includes: 
+ - ipt_ah 
+ - ipt_esp
+endef
+
 $(eval $(call KernelPackage,ipt-ipsec))


 define KernelPackage/ipt-nat
  SUBMENU:=$(NFMENU)
  TITLE:=Modules for extra NAT targets
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for extra NAT targets \\\
-	\\\
-	Includes: \\\
-	- ipt_REDIRECT \\\
-	- ipt_NETMAP
  KCONFIG:=$(KCONFIG_IPT_NAT)
  FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT-m)))
 endef

+define KernelPackage/ipt-nat/description
+ Netfilter (IPv4) modules for extra NAT targets 
+ Includes: 
+ - ipt_REDIRECT 
+ - ipt_NETMAP
+endef
+
 $(eval $(call KernelPackage,ipt-nat))


 define KernelPackage/ipt-nathelper
  SUBMENU:=$(NFMENU)
  TITLE:=Default Conntrack and NAT helpers
-  DESCRIPTION:=\
-	Default Netfilter (IPv4) Conntrack and NAT helpers \\\
-	\\\
-	Includes: \\\
-	- ip_conntrack_ftp \\\
-	- ip_nat_ftp \\\
-	- ip_conntrack_irc \\\
-	- ip_nat_irc \\\
-	- ip_conntrack_tftp
  KCONFIG:=$(KCONFIG_IPT_NAT_DEFAULT)
  FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_DEFAULT-m)))
 endef

+define KernelPackage/ipt-nathelper/description
+ Default Netfilter (IPv4) Conntrack and NAT helpers 
+ Includes: 
+ - ip_conntrack_ftp 
+ - ip_nat_ftp 
+ - ip_conntrack_irc 
+ - ip_nat_irc 
+ - ip_conntrack_tftp
+endef
+
 $(eval $(call KernelPackage,ipt-nathelper))


 define KernelPackage/ipt-nathelper-extra
  SUBMENU:=$(NFMENU)
  TITLE:=Extra Conntrack and NAT helpers
-  DESCRIPTION:=\
-	Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
-	\\\
-	Includes: \\\
-	- ip_conntrack_amanda \\\
-	- ip_conntrack_proto_gre \\\
-	- ip_nat_proto_gre \\\
-	- ip_conntrack_pptp \\\
-	- ip_nat_pptp \\\
-	- ip_conntrack_sip \\\
-	- ip_nat_sip \\\
-	- ip_nat_snmp_basic
  KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA)
  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_EXTRA-m)))
 endef

+define KernelPackage/ipt-nathelper-extra/description
+ Extra Netfilter (IPv4) Conntrack and NAT helpers 
+ Includes: 
+ - ip_conntrack_amanda 
+ - ip_conntrack_proto_gre 
+ - ip_nat_proto_gre 
+ - ip_conntrack_pptp 
+ - ip_nat_pptp 
+ - ip_conntrack_sip 
+ - ip_nat_sip 
+ - ip_nat_snmp_basic
+endef
+
 $(eval $(call KernelPackage,ipt-nathelper-extra))


 define KernelPackage/ipt-imq
  SUBMENU:=$(NFMENU)
  TITLE:=Intermediate Queueing support
-  DESCRIPTION:=\
-	Kernel support for Intermediate Queueing devices
  KCONFIG:=CONFIG_IP_NF_TARGET_IMQ
  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX)))))
 endef

+define KernelPackage/ipt-imq/description
+ Kernel support for Intermediate Queueing devices
+endef
+
 $(eval $(call KernelPackage,ipt-imq))


 define KernelPackage/ipt-queue
  SUBMENU:=$(NFMENU)
  TITLE:=Module for user-space packet queueing
-  DESCRIPTION:=\
-	Netfilter (IPv4) module for user-space packet queueing \\\
-	\\\
-	Includes: \\\
-	- ipt_QUEUE
  KCONFIG:=$(KCONFIG_IPT_QUEUE)
  FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_QUEUE-m)))
 endef

+define KernelPackage/ipt-queue/description
+ Netfilter (IPv4) module for user-space packet queueing 
+ Includes: 
+ - ipt_QUEUE
+endef
+
 $(eval $(call KernelPackage,ipt-queue))


 define KernelPackage/ipt-ulog
  SUBMENU:=$(NFMENU)
  TITLE:=Module for user-space packet logging
-  DESCRIPTION:=\
-	Netfilter (IPv4) module for user-space packet logging \\\
-	\\\
-	Includes: \\\
-	- ipt_ULOG
  KCONFIG:=$(KCONFIG_IPT_ULOG)
  FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_ULOG-m)))
 endef

+define KernelPackage/ipt-ulog/description
+ Netfilter (IPv4) module for user-space packet logging 
+ Includes: 
+ - ipt_ULOG
+endef
+
 $(eval $(call KernelPackage,ipt-ulog))


 define KernelPackage/ipt-iprange
  SUBMENU:=$(NFMENU)
  TITLE:=Module for matching ip ranges
-  DESCRIPTION:=\
-	Netfilter (IPv4) module for matching ip ranges \\\
-	\\\
-	Includes: \\\
-	- ipt_IPRANGE
  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/ipt_iprange.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPRANGE-m)))
 endef

+define KernelPackage/ipt-iprange/description
+ Netfilter (IPv4) module for matching ip ranges 
+ Includes: 
+ - ipt_IPRANGE
+endef
+
 $(eval $(call KernelPackage,ipt-iprange))


 define KernelPackage/ipt-ipset
  SUBMENU:=$(NFMENU)
  TITLE:=IPSET Modules
-  DESCRIPTION:=\
-  	Netfilter kernel modules for ipset
  KCONFIG:=$(KCONFIG_IPT_IPSET)
  FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSET-m)))
 endef

+define KernelPackage/ipt-ipset/description
+ Netfilter kernel modules for ipset
+endef
+
 $(eval $(call KernelPackage,ipt-ipset))


 define KernelPackage/ipt-extra
  SUBMENU:=$(NFMENU)
  TITLE:=Extra modules
-  DESCRIPTION:=\
-	Other Netfilter (IPv4) kernel modules\\\
-	Includes: \\\
-	- ipt_limit \\\
-	- ipt_owner \\\
-	- ipt_physdev \\\
-	- ipt_pkttype \\\
-	- ipt_recent \\\
-	- iptable_raw \\\
-	- xt_NOTRACK 
  KCONFIG:=$(KCONFIG_IPT_EXTRA)
  FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_EXTRA-m)))
 endef

+define KernelPackage/ipt-extra/description
+ Other Netfilter (IPv4) kernel modules
+ Includes: 
+ - ipt_limit 
+ - ipt_owner 
+ - ipt_physdev 
+ - ipt_pkttype 
+ - ipt_recent 
+ - iptable_raw 
+ - xt_NOTRACK 
+endef
+
 $(eval $(call KernelPackage,ipt-extra))


 define KernelPackage/ip6tables
  SUBMENU:=$(NFMENU)
  TITLE:=IPv6 modules
-  DESCRIPTION:=\
-	Netfilter IPv6 firewalling support
  KCONFIG:=CONFIG_IP6_NF_IPTABLES
  FILES:=$(LINUX_DIR)/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX)))))
 endef

+define KernelPackage/ip6tables/description
+ Netfilter IPv6 firewalling support
+endef
+
 $(eval $(call KernelPackage,ip6tables))


 define KernelPackage/arptables
  SUBMENU:=$(NFMENU)
  TITLE:=ARP firewalling modules
-  DESCRIPTION:=\
-	Kernel modules for ARP firewalling
  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
  KCONFIG:=CONFIG_IP_NF_ARPTABLES
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)))))
 endef

+define KernelPackage/arptables/description
+ Kernel modules for ARP firewalling
+endef
+
 $(eval $(call KernelPackage,arptables))


 define KernelPackage/ebtables
  SUBMENU:=$(NFMENU)
  TITLE:=Bridge firewalling modules
-  DESCRIPTION:=\
-	Kernel modules for Ethernet Bridge firewalling
  DEPENDS:=@LINUX_2_6
  FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
  KCONFIG:=CONFIG_BRIDGE_NF_EBTABLES
  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX)))))
 endef

+define KernelPackage/ebtables/description
+ Kernel modules for Ethernet Bridge firewalling
+endef
+
 $(eval $(call KernelPackage,ebtables))
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@ -11,8 +11,6 @@ NSMENU:=Network Support
 define KernelPackage/atm
  SUBMENU:=$(NSMENU)
  TITLE:=ATM support
-  DESCRIPTION:= \
-    Kernel modules for ATM support
  DEPENDS:=@LINUX_2_6
  KCONFIG:= \
 	CONFIG_ATM \
@ -23,39 +21,47 @@ define KernelPackage/atm
  AUTOLOAD:=$(call AutoLoad,30,atm br2684)
 endef

+define KernelPackage/atm/description
+ Kernel modules for ATM support
+endef
+
 $(eval $(call KernelPackage,atm))


 define KernelPackage/atmtcp
  SUBMENU:=$(NSMENU)
  TITLE:=ATM over TCP
-  DESCRIPTION:= \
-    Kernel module for ATM over TCP support
  DEPENDS:=@LINUX_2_6 kmod-atm
  KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y
  FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,atmtcp)
 endef

+define KernelPackage/atmtcp/description
+ Kernel module for ATM over TCP support
+endef
+
 $(eval $(call KernelPackage,atmtcp))


 define KernelPackage/bonding
  SUBMENU:=$(NSMENU)
  TITLE:=Ethernet bonding driver
-  DESCRIPTION:= \
-    Kernel module for NIC bonding.
  KCONFIG:=CONFIG_BONDING
  FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,bonding)
 endef
+
+define KernelPackage/bonding/description
+ Kernel module for NIC bonding.
+endef
+
 $(eval $(call KernelPackage,bonding))

+
 define KernelPackage/ipip
  SUBMENU:=$(NSMENU)
  TITLE:=IP in IP encapsulation support
-  DESCRIPTION:=\
-	Kernel modules for IP in IP encapsulation
  KCONFIG:=CONFIG_NET_IPIP
  FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,ipip)
@ -67,17 +73,16 @@ define KernelPackage/ipip/2.6
  AUTOLOAD+=$(call AutoLoad,31,tunnel4)
 endef

+define KernelPackage/ipip/description
+ Kernel modules for IP in IP encapsulation
+endef
+
 $(eval $(call KernelPackage,ipip))


 define KernelPackage/ipsec
  SUBMENU:=$(NSMENU)
  TITLE:=IPsec related modules (IPv4 and IPv6)
-  DESCRIPTION:=\
-	Kernel modules for IPsec support in both IPv4 and IPv6.\\\
-	Includes:\\\
-	- af_key\\\
-	- xfrm_user
  DEPENDS:=@LINUX_2_6
  KCONFIG:= \
 	CONFIG_NET_KEY \
@ -87,19 +92,19 @@ define KernelPackage/ipsec
 	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/ipsec/description
+ Kernel modules for IPsec support in both IPv4 and IPv6.
+ Includes:
+ - af_key
+ - xfrm_user
+endef
+
 $(eval $(call KernelPackage,ipsec))


 define KernelPackage/ipsec4
  SUBMENU:=$(NSMENU)
  TITLE:=IPsec related modules (IPv4)
-  DESCRIPTION:=\
-	Kernel modules for IPsec support in IPv4.\\\
-	Includes:\\\
-	- ah4\\\
-	- esp4\\\
-	- ipcomp\\\
-	- xfrm4_tunnel
  DEPENDS:=kmod-ipsec
  KCONFIG:= \
 	CONFIG_INET_AH \
@ -111,20 +116,21 @@ define KernelPackage/ipsec4
  )
 endef

+define KernelPackage/ipsec4/description
+ Kernel modules for IPsec support in IPv4.
+ Includes:
+ - ah4
+ - esp4
+ - ipcomp
+ - xfrm4_tunnel
+endef
+
 $(eval $(call KernelPackage,ipsec4))


 define KernelPackage/ipsec6
  SUBMENU:=$(NSMENU)
  TITLE:=IPsec related modules (IPv6)
-  DESCRIPTION:=\
-	Kernel modules for IPsec support in IPv6.\\\
-	Includes:\\\
-	- ah6\\\
-	- esp6\\\
-	- ipcomp6\\\
-	- xfrm6_tunnel\\\
-	- tunnel6
  DEPENDS:=kmod-ipsec
  KCONFIG:= \
 	CONFIG_INET6_AH \
@ -137,14 +143,22 @@ define KernelPackage/ipsec6
  )
 endef

+define KernelPackage/ipsec6/description
+ Kernel modules for IPsec support in IPv6.
+ Includes:
+ - ah6
+ - esp6
+ - ipcomp6
+ - xfrm6_tunnel
+ - tunnel6
+endef
+
 $(eval $(call KernelPackage,ipsec6))


 define KernelPackage/ipv6
  SUBMENU:=$(NSMENU)
  TITLE:=IPv6 support
-  DESCRIPTION:=\
-	Kernel modules for IPv6 support
  KCONFIG:=CONFIG_IPV6
  FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,20,ipv6)
@ -156,39 +170,45 @@ define KernelPackage/ipv6/2.6
  AUTOLOAD+=$(call AutoLoad,21,sit)
 endef

+define KernelPackage/ipv6/description
+ Kernel modules for IPv6 support
+endef
+
 $(eval $(call KernelPackage,ipv6))


 define KernelPackage/gre
  SUBMENU:=$(NSMENU)
  TITLE:=GRE support
-  DESCRIPTION:=\
-	Generic Routing Encapsulation support
  KCONFIG:=CONFIG_NET_IPGRE
  FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/gre/description
+ Generic Routing Encapsulation support
+endef
+
 $(eval $(call KernelPackage,gre))


 define KernelPackage/tun
  SUBMENU:=$(NSMENU)
  TITLE:=Universal TUN/TAP driver
-  DESCRIPTION:=\
-	Kernel support for the TUN/TAP tunneling device
  KCONFIG:=CONFIG_TUN
  FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,tun)
 endef

+define KernelPackage/tun/description
+ Kernel support for the TUN/TAP tunneling device
+endef
+
 $(eval $(call KernelPackage,tun))


 define KernelPackage/ppp
  SUBMENU:=$(NSMENU)
  TITLE:=PPP modules
-  DESCRIPTION:=\
-	Kernel modules for PPP support
  KCONFIG:= \
 	CONFIG_PPP \
 	CONFIG_PPP_ASYNC
@ -211,28 +231,32 @@ define KernelPackage/ppp/2.6
  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async)
 endef

+define KernelPackage/ppp/description
+ Kernel modules for PPP support
+endef
+
 $(eval $(call KernelPackage,ppp))


 define KernelPackage/ppp-synctty
  SUBMENU:=$(NSMENU)
  TITLE:=PPP sync tty support
-  DESCRIPTION:=\
-	Kernel modules for PPP sync tty support
  DEPENDS:=kmod-ppp
  KCONFIG:=CONFIG_PPP_SYNC_TTY
  FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,ppp_synctty)
 endef

+define KernelPackage/ppp-synctty/description
+ Kernel modules for PPP sync tty support
+endef
+
 $(eval $(call KernelPackage,ppp-synctty))


 define KernelPackage/pppoe
  SUBMENU:=$(NSMENU)
  TITLE:=PPPoE support
-  DESCRIPTION:=\
-	Kernel modules for PPPoE (PPP over Ethernet) support
  DEPENDS:=kmod-ppp
  KCONFIG:=CONFIG_PPPOE
  FILES:= \
@ -240,27 +264,32 @@ define KernelPackage/pppoe
 	$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/pppoe/description
+ Kernel modules for PPPoE (PPP over Ethernet) support
+endef
+
 $(eval $(call KernelPackage,pppoe))


 define KernelPackage/pppoa
  SUBMENU:=$(NSMENU)
  TITLE:=PPPoA support
-  DESCRIPTION:=\
-	Kernel modules for PPPoA (PPP over ATM) support
  DEPENDS:=kmod-ppp kmod-atm
  KCONFIG:=CONFIG_PPPOATM
  FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,pppoatm)
 endef

+define KernelPackage/pppoa/description
+ Kernel modules for PPPoA (PPP over ATM) support
+endef
+
 $(eval $(call KernelPackage,pppoa))


 define KernelPackage/mppe
  SUBMENU:=$(NSMENU)
  TITLE:=Microsoft PPP compression/encryption
-  DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
  DEPENDS:=kmod-ppp
 endef

@ -276,25 +305,30 @@ define KernelPackage/mppe/2.6
  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef

+define KernelPackage/mppe/description
+ Kernel modules for Microsoft PPP compression/encryption
+endef
+
 $(eval $(call KernelPackage,mppe))


 define KernelPackage/sched
  SUBMENU:=$(NSMENU)
  TITLE:=Traffic schedulers
-  DESCRIPTION:=\
-	Kernel schedulers for IP traffic
  KCONFIG:=CONFIG_NET_SCHED
  FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/sched/description
+ Kernel schedulers for IP traffic
+endef
+
 $(eval $(call KernelPackage,sched))


 define KernelPackage/ax25
  SUBMENU:=$(NSMENU)
  TITLE:=AX25 support
-  DESCRIPTION:=Kernel modules for AX25 support
  KCONFIG:= \
 	CONFIG_AX25 \
 	CONFIG_MKISS
@ -304,6 +338,10 @@ define KernelPackage/ax25
  AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
 endef

+define KernelPackage/ax25/description
+ Kernel modules for AX25 support
+endef
+
 $(eval $(call KernelPackage,ax25))


@ -311,12 +349,6 @@ define KernelPackage/mp-alg
  SUBMENU:=$(NSMENU)
  TITLE:=ECMP caching algorithms
  DEPENDS:=@LINUX_2_6
-  DESCRIPTION:= \
-	Kernel modules that provide several different algorithms for multipath \\\
-	route selection from the route cache. The iproute "mpath" argument allows \\\
-	specifying which algorithm to use for routes. \\\
-	quagga (at least <=0.99.6) requires a multipath patch to support this \\\
-	cached mp route feature.
  KCONFIG:= \
 	CONFIG_IP_ROUTE_MULTIPATH_RR \
 	CONFIG_IP_ROUTE_MULTIPATH_RANDOM \
@ -330,6 +362,14 @@ define KernelPackage/mp-alg
  AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
 endef

+define KernelPackage/mp-alg/description
+ Kernel modules that provide several different algorithms for multipath 
+ route selection from the route cache. The iproute "mpath" argument allows 
+ specifying which algorithm to use for routes. 
+ quagga (at least <=0.99.6) requires a multipath patch to support this 
+ cached mp route feature.
+endef
+
 $(eval $(call KernelPackage,mp-alg))


@ -338,106 +378,118 @@ NDMENU:=Network Devices
 define KernelPackage/natsemi
  SUBMENU:=$(NDMENU)
  TITLE:=National Semiconductor DP8381x series 
-  DESCRIPTION:=\
-	Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\
-	adapters.
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_NATSEMI
  FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef

+define KernelPackage/natsemi/description
+ Kernel modules for National Semiconductor DP8381x series PCI Ethernet 
+ adapters.
+endef
+
 $(eval $(call KernelPackage,natsemi))


 define KernelPackage/r6040
  SUBMENU:=$(NDMENU)
  TITLE:=RDC Fast-Ethernet support
-  DESCRIPTION:=\
-	Kernel modules for RDC Fast-Ethernet adapters.
  DEPENDS:=@LINUX_2_6_RDC
  KCONFIG:=CONFIG_R6040
  FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/r6040/description
+ Kernel modules for RDC Fast-Ethernet adapters.
+endef
+
 $(eval $(call KernelPackage,r6040))


 define KernelPackage/sis900
  SUBMENU:=$(NDMENU)
  TITLE:=SiS 900 Ethernet support
-  DESCRIPTION:=\
-	Kernel modules for Sis 900 Ethernet adapters.
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_SIS900
  FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,sis900)
 endef

+define KernelPackage/sis900/description
+ Kernel modules for Sis 900 Ethernet adapters.
+endef
+
 $(eval $(call KernelPackage,sis900))


 define KernelPackage/via-rhine
  SUBMENU:=$(NDMENU)
  TITLE:=Via Rhine ethernet support
-  DESCRIPTION:=\
-	Kernel modules for Via Rhine Ethernet chipsets.
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_VIA_RHINE
  FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef

+define KernelPackage/via-rhine/description
+ Kernel modules for Via Rhine Ethernet chipsets.
+endef
+
 $(eval $(call KernelPackage,via-rhine))


 define KernelPackage/via-velocity
  SUBMENU:=$(NDMENU)
  TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
-  DESCRIPTION:=\
-	Kernel modules for VIA Velocity Gigabit Ethernet chipsets.
  DEPENDS:=@LINUX_2_6_IXP4XX
  KCONFIG:=CONFIG_VIA_VELOCITY
  FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,via-velocity)
 endef

+define KernelPackage/via-velocity/description
+ Kernel modules for VIA Velocity Gigabit Ethernet chipsets.
+endef
+
 $(eval $(call KernelPackage,via-velocity))


 define KernelPackage/8139too
  SUBMENU:=$(NDMENU)
  TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
-  DESCRIPTION:=\
-	Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_8139TOO
  FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,8139too)
 endef

+define KernelPackage/8139too/description
+ Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
+endef
+
 $(eval $(call KernelPackage,8139too))


 define KernelPackage/r8169
  SUBMENU:=$(NDMENU)
  TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
-  DESCRIPTION:=\
-	Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters.
  DEPENDS:=@LINUX_2_6_X86 
  KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
  FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,r8169)
 endef

+define KernelPackage/r8169/description
+ Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters.
+endef
+
 $(eval $(call KernelPackage,r8169))


 define KernelPackage/ne2k-pci
  SUBMENU:=$(NDMENU)
  TITLE:=ne2k-pci Ethernet Adapter kernel support
-  DESCRIPTION:=\
-	ne2k-pci Ethernet Adapter kernel support.
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_NE2K_PCI
  FILES:= \
@ -446,14 +498,16 @@ define KernelPackage/ne2k-pci
  AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
 endef

+define KernelPackage/ne2k-pci/description
+ Kernel modules for NE2000 PCI Ethernet Adapter kernel.
+endef
+
 $(eval $(call KernelPackage,ne2k-pci))


 define KernelPackage/ixp4xx-npe
  SUBMENU:=$(NDMENU)
  TITLE:=Intel(R) IXP4xx ethernet support
-  DESCRIPTION:=\
-	Kernel modules for Intel(R) IXP4xx onboard ethernet.
  DEPENDS:=@LINUX_2_6_IXP4XX
  KCONFIG:=CONFIG_IXP4XX_MAC
  FILES:= \
@ -463,52 +517,62 @@ define KernelPackage/ixp4xx-npe
  AUTOLOAD:=$(call AutoLoad,20,ixp4xx_npe ixp4xx_qmgr ixp4xx_mac)
 endef

+define KernelPackage/ixp4xx-npe/description
+ Kernel modules for Intel(R) IXP4xx onboard ethernet.
+endef
+
 $(eval $(call KernelPackage,ixp4xx-npe))


 define KernelPackage/e100
  SUBMENU:=$(NDMENU)
  TITLE:=Intel(R) PRO/100+ cards kernel support
-  DESCRIPTION:=\
-	Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_E100
  FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,e100)
 endef

+define KernelPackage/e100/description
+ Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
+endef
+
 $(eval $(call KernelPackage,e100))


 define KernelPackage/e1000
  SUBMENU:=$(NDMENU)
  TITLE:=Intel(R) PRO/1000 cards kernel support
-  DESCRIPTION:=\
-	Kernel modules for Intel(R) PRO/1000 Ethernet adapters.
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_E1000
  FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,e1000)
 endef

+define KernelPackage/e1000/description
+ Kernel modules for Intel(R) PRO/1000 Ethernet adapters.
+endef
+
 $(eval $(call KernelPackage,e1000))


 define KernelPackage/3c59x
  SUBMENU:=$(NDMENU)
  TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
-  DESCRIPTION:=\
-	This option enables driver support for a large number of 10mbps and \\\
-	10/100mbps EISA, PCI and PCMCIA 3Com Ethernet adapters: \\\
-	- "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \\\
-	- "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI \\\
-	- "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus \\\
-	- "Tornado"   (3c905)                                  PCI  \\\
-	- "Hurricane" (3c555/3cSOHO)                           PCI 
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_3C59X
  FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,3c59x)
 endef

+define KernelPackage/3c59x/description
+ This option enables driver support for a large number of 10mbps and 
+ 10/100mbps EISA, PCI and PCMCIA 3Com Ethernet adapters: 
+ - "Vortex"    (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI 
+ - "Boomerang" (EtherLink XL 3c900 or 3c905)            PCI 
+ - "Cyclone"   (3c540/3c900/3c905/3c980/3c575/3c656)    PCI and Cardbus 
+ - "Tornado"   (3c905)                                  PCI  
+ - "Hurricane" (3c555/3cSOHO)                           PCI 
+endef
+
 $(eval $(call KernelPackage,3c59x))
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@ -89,7 +89,6 @@ $(eval $(call KernelPackage,lp))
 define KernelPackage/soundcore
  SUBMENU:=$(EMENU)
  TITLE:=Sound support
-  DESCRIPTION:=Kernel modules for sound support
  KCONFIG:=CONFIG_SOUND
 endef

@ -137,37 +136,46 @@ define KernelPackage/soundcore/uml-2.6
  AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
 endef

+define KernelPackage/soundcore/description
+ Kernel modules for sound support
+endef
+
 $(eval $(call KernelPackage,soundcore))


 define KernelPackage/loop
  SUBMENU:=$(EMENU)
  TITLE:=Loopback device support
-  DESCRIPTION:=Kernel module for loopback device support
  KCONFIG:=CONFIG_BLK_DEV_LOOP
  FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,loop)
 endef

+define KernelPackage/loop/description
+ Kernel module for loopback device support
+endef
+
 $(eval $(call KernelPackage,loop))


 define KernelPackage/nbd
  SUBMENU:=$(EMENU)
  TITLE:=Network block device support
-  DESCRIPTION:=Kernel module for network block device support
  KCONFIG:=CONFIG_BLK_DEV_NBD
  FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,30,nbd)
 endef

+define KernelPackage/nbd/description
+ Kernel module for network block device support
+endef
+
 $(eval $(call KernelPackage,nbd))


 define KernelPackage/capi
  SUBMENU:=$(EMENU)
  TITLE:=CAPI Support
-  DESCRIPTION:=Kernel module for basic CAPI support
  DEPENDS:=@LINUX_2_6
  KCONFIG:= \
 	CONFIG_ISDN \
@ -179,13 +187,16 @@ define KernelPackage/capi
  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
 endef

+define KernelPackage/capi/description
+ Kernel module for basic CAPI support
+endef
+
 $(eval $(call KernelPackage,capi))


 define KernelPackage/pcmcia-core
  SUBMENU:=$(EMENU)
  TITLE:=PCMCIA/CardBus support
-  DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
  DEPENDS:=@PCMCIA_SUPPORT
 endef

@ -224,6 +235,9 @@ define KernelPackage/pcmcia-core/au1000-2.6
  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic au1x00_ss)
 endef

+define KernelPackage/pcmcia-core/description
+ Kernel support for PCMCIA/CardBus controllers
+endef

 $(eval $(call KernelPackage,pcmcia-core))

@ -231,7 +245,6 @@ $(eval $(call KernelPackage,pcmcia-core))
 define KernelPackage/pcmcia-serial
  SUBMENU:=$(EMENU)
  TITLE:=Serial devices support
-  DESCRIPTION:=Kernel support for PCMCIA/CardBus serial devices
  DEPENDS:=kmod-pcmcia-core
  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
@ -246,6 +259,10 @@ define KernelPackage/pcmcia-serial/2.6
  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/pcmcia-serial/description
+ Kernel support for PCMCIA/CardBus serial devices
+endef
+
 $(eval $(call KernelPackage,pcmcia-serial))


@ -253,7 +270,6 @@ define KernelPackage/bluetooth
  SUBMENU:=$(EMENU)
  TITLE:=Bluetooth support
  DEPENDS:=@USB_SUPPORT
-  DESCRIPTION:=Kernel support for Bluetooth devices
 endef

 define KernelPackage/bluetooth/2.4
@ -296,6 +312,10 @@ define KernelPackage/bluetooth/2.6
  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb)
 endef

+define KernelPackage/bluetooth/description
+ Kernel support for Bluetooth devices
+endef
+
 $(eval $(call KernelPackage,bluetooth))


@ -303,7 +323,6 @@ define KernelPackage/mmc
  SUBMENU:=$(EMENU)
  TITLE:=MMC/SD Card Support
  DEPENDS:=@LINUX_2_6_AT91
-  DESCRIPTION:=Kernel support for MMC/SD cards
  KCONFIG:= \
 	CONFIG_MMC \
 	CONFIG_MMC_BLOCK \
@ -315,13 +334,16 @@ define KernelPackage/mmc
  AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
 endef

+define KernelPackage/mmc/description
+ Kernel support for MMC/SD cards
+endef
+
 $(eval $(call KernelPackage,mmc))


 define KernelPackage/softdog
  SUBMENU:=$(EMENU)
  TITLE:=Software watchdog driver
-  DESCRIPTION:=Software watchdog driver
  KCONFIG:=CONFIG_SOFT_WATCHDOG
  AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
@ -334,13 +356,16 @@ define KernelPackage/softdog/2.6
  FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
 endef

+define KernelPackage/softdog/description
+ Software watchdog driver
+endef
+
 $(eval $(call KernelPackage,softdog))


 define KernelPackage/videodev
  SUBMENU:=$(EMENU)
  TITLE=Video4Linux support
-  DESCRIPTION:=Kernel modules for Video4Linux support
  KCONFIG:=CONFIG_VIDEO_DEV
 endef

@ -363,65 +388,80 @@ define KernelPackage/videodev/2.6
  )
 endef

+define KernelPackage/videodev/description
+ Kernel modules for Video4Linux support
+endef
+
 $(eval $(call KernelPackage,videodev))


 define KernelPackage/leds-net48xx
  SUBMENU:=$(EMENU)
  TITLE:=Soekris Net48xx LED support
-  DESCRIPTION:=Kernel module for Soekris Net48xx LEDs
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_LEDS_NET48XX
  FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
 endef

+define KernelPackage/leds-net48xx/description
+ Kernel module for Soekris Net48xx LEDs
+endef
+
 $(eval $(call KernelPackage,leds-net48xx))


 define KernelPackage/nsc-gpio
  SUBMENU:=$(EMENU)
  TITLE:=Natsemi GPIO support
-  DESCRIPTION:=Kernel module for Natsemi GPIO
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_NSC_GPIO
  FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
 endef

+define KernelPackage/nsc-gpio/description
+ Kernel module for Natsemi GPIO
+endef
+
 $(eval $(call KernelPackage,nsc-gpio))


 define KernelPackage/scx200-gpio
  SUBMENU:=$(EMENU)
  TITLE:=Natsemi SCX200 GPIO support
-  DESCRIPTION:=Kernel module for SCX200 GPIO
  DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86
  KCONFIG:=CONFIG_SCx200_GPIO
  FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
 endef

+define KernelPackage/scx200-gpio/description
+ Kernel module for SCX200 GPIO
+endef
+
 $(eval $(call KernelPackage,scx200-gpio))


 define KernelPackage/scx200-wdt
  SUBMENU:=$(EMENU)
  TITLE:=Natsemi SCX200 Watchdog support
-  DESCRIPTION:=Kernel module for SCX200 Watchdog
  DEPENDS:=@LINUX_2_6_X86
  KCONFIG:=CONFIG_SC1200_WDT
  FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 endef

+define KernelPackage/scx200-wdt/description
+ Kernel module for SCX200 Watchdog
+endef
+
 $(eval $(call KernelPackage,scx200-wdt))


 define KernelPackage/hwmon
  SUBMENU:=$(EMENU)
  TITLE:=Hardware monitoring support
-  DESCRIPTION:=Kernel modules for hardware monitoring
  DEPENDS:=@LINUX_2_6
  KCONFIG:= \
 	CONFIG_HWMON \
@ -433,43 +473,56 @@ define KernelPackage/hwmon
  AUTOLOAD:=$(call AutoLoad,40,hwmon hwmon-vid)
 endef

+define KernelPackage/hwmon/description
+ Kernel modules for hardware monitoring
+endef
+
 $(eval $(call KernelPackage,hwmon))


 define KernelPackage/hwmon-pc87360
  SUBMENU:=$(EMENU)
  TITLE:=PC87360 monitoring support
-  DESCRIPTION:=Kernel modules for PC87360 chips
  DEPENDS:=kmod-hwmon
  KCONFIG:=CONFIG_SENSORS_PC87360
  FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,pc87360)
 endef

+define KernelPackage/hwmon-pc87360/description
+ Kernel modules for PC87360 chips
+endef
+
 $(eval $(call KernelPackage,hwmon-pc87360))


 define KernelPackage/input-core
  SUBMENU:=$(EMENU)
  TITLE:=Input device core
-  DESCRIPTION:=Kernel modules for support of input device
  DEPENDS:=@LINUX_2_6
  KCONFIG:=CONFIG_INPUT
  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,input-core)
 endef

+define KernelPackage/input-core/description
+ Kernel modules for support of input device
+endef
+
 $(eval $(call KernelPackage,input-core))


 define KernelPackage/input-evdev
  SUBMENU:=$(EMENU)
  TITLE:=Input even device
-  DESCRIPTION:=Kernel modules for support of input device events
  DEPENDS:=+kmod-input-core
  KCONFIG:=CONFIG_INPUT_EVDEV
  FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,60,evdev)
 endef

+define KernelPackage/input-evdev/description
+ Kernel modules for support of input device events
+endef
+
 $(eval $(call KernelPackage,input-evdev))
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@ -31,7 +31,6 @@ endef
 define KernelPackage/usb-core
  SUBMENU:=$(USBMENU)
  TITLE:=Support for USB
-  DESCRIPTION:=Kernel support for USB
  DEPENDS:=@USB_SUPPORT
  KCONFIG:=CONFIG_USB
  AUTOLOAD:=$(call AutoLoad,20,usbcore)
@ -45,13 +44,16 @@ define KernelPackage/usb-core/2.6
  FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/usb-core/description
+ Kernel support for USB
+endef
+
 $(eval $(call KernelPackage,usb-core))


 define KernelPackage/usb-uhci
  $(call usbdep,)
  TITLE:=Support for UHCI controllers
-  DESCRIPTION:=Kernel support for USB UHCI controllers
 endef

 define KernelPackage/usb-uhci/2.4
@ -66,25 +68,31 @@ define KernelPackage/usb-uhci/2.6
  AUTOLOAD:=$(call AutoLoad,50,uhci-hcd)
 endef

+define KernelPackage/usb-uhci/description
+ Kernel support for USB UHCI controllers
+endef
+
 $(eval $(call KernelPackage,usb-uhci))


 define KernelPackage/usb-uhci-iv
  $(call usbdep,@LINUX_2_4)
  TITLE:=Support for Intel/VIA UHCI controllers 
-  DESCRIPTION:=Kernel support for Intel/VIA USB UHCI controllers
  KCONFIG:=CONFIG_USB_UHCI
  FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,usb-uhci) 
 endef 

+define KernelPackage/usb-uhci-iv/description
+ Kernel support for Intel/VIA USB UHCI controllers
+endef
+
 $(eval $(call KernelPackage,usb-uhci-iv)) 


 define KernelPackage/usb-ohci
  $(call usbdep,)
  TITLE:=Support for OHCI controllers
-  DESCRIPTION:=Kernel support for USB OHCI controllers
 endef

 define KernelPackage/usb-ohci/2.4
@ -99,37 +107,46 @@ define KernelPackage/usb-ohci/2.6
  AUTOLOAD:=$(call AutoLoad,50,ohci-hcd)
 endef

+define KernelPackage/usb-ohci/description
+ Kernel support for USB OHCI controllers
+endef
+
 $(eval $(call KernelPackage,usb-ohci))


 define KernelPackage/usb-adm5120
  $(call usbdep,@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB)
  TITLE:=Support for the ADM5120 HCD controller
-  DESCRIPTION:=Kernel support for the ADM5120 HCD USB controller
  KCONFIG:=CONFIG_USB_ADM5120_HCD
  FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,adm5120-hcd)
 endef

+define KernelPackage/usb-adm5120/description
+ Kernel support for the ADM5120 HCD USB controller
+endef
+
 $(eval $(call KernelPackage,usb-adm5120))


 define KernelPackage/usb2
  $(call usbdep,)
  TITLE:=Support for USB2 controllers
-  DESCRIPTION:=Kernel support for USB2 (EHCI) controllers
  KCONFIG:=CONFIG_USB_EHCI_HCD
  FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,ehci-hcd)
 endef

+define KernelPackage/usb2/description
+ Kernel support for USB2 (EHCI) controllers
+endef
+
 $(eval $(call KernelPackage,usb2))


 define KernelPackage/usb-acm
  $(call usbdep,)
  TITLE:=Support for modems/isdn controllers
-  DESCRIPTION:=Kernel support for USB ACM devices (modems/isdn controllers)
  KCONFIG:=CONFIG_USB_ACM
 endef

@ -143,13 +160,16 @@ define KernelPackage/usb-acm/2.6
  AUTOLOAD:=$(call AutoLoad,60,cdc-acm)
 endef

+define KernelPackage/usb-acm/description
+ Kernel support for USB ACM devices (modems/isdn controllers)
+endef
+
 $(eval $(call KernelPackage,usb-acm))


 define KernelPackage/usb-audio
  $(call usbdep,+kmod-soundcore)
  TITLE:=Support for audio devices
-  DESCRIPTION:=Kernel support for USB audio devices
 endef

 define KernelPackage/usb-audio/2.4
@ -166,13 +186,16 @@ define KernelPackage/usb-audio/2.6
  AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
 endef

+define KernelPackage/usb-audio/description
+ Kernel support for USB audio devices
+endef
+
 $(eval $(call KernelPackage,usb-audio))


 define KernelPackage/usb-printer
  $(call usbdep,)
  TITLE:=Support for printers
-  DESCRIPTION:=Kernel support for USB printers
  KCONFIG:=CONFIG_USB_PRINTER
 endef

@ -186,109 +209,136 @@ define KernelPackage/usb-printer/2.6
  AUTOLOAD:=$(call AutoLoad,60,usblp)
 endef

+define KernelPackage/usb-printer/description
+ Kernel support for USB printers
+endef
+
 $(eval $(call KernelPackage,usb-printer))


 define KernelPackage/usb-serial
  $(call usbdep,)
  TITLE:=Support for USB-to-Serial converters
-  DESCRIPTION:=Kernel support for USB-to-Serial converters
  KCONFIG:=CONFIG_USB_SERIAL
  FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,60,usbserial)
 endef

+define KernelPackage/usb-serial/description
+ Kernel support for USB-to-Serial converters
+endef
+
 $(eval $(call KernelPackage,usb-serial))


 define KernelPackage/usb-serial-airprime
  $(call usbdep,kmod-usb-serial @LINUX_2_6)
  TITLE:=Support for Airprime (EVDO) 
-  DESCRIPTION:=Kernel support for Airprime (EVDO) 
  KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME
  FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,airprime)
 endef

+define KernelPackage/usb-serial-airprime/description
+ Kernel support for Airprime (EVDO) 
+endef
+
 $(eval $(call KernelPackage,usb-serial-airprime))


 define KernelPackage/usb-serial-belkin
  $(call usbdep,kmod-usb-serial)
  TITLE:=Support for Belkin devices
-  DESCRIPTION:=Kernel support for Belkin USB-to-Serial converters
  KCONFIG:=CONFIG_USB_SERIAL_BELKIN
  FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,belkin_sa)
 endef

+define KernelPackage/usb-serial-belkin/description
+ Kernel support for Belkin USB-to-Serial converters
+endef
+
 $(eval $(call KernelPackage,usb-serial-belkin))


 define KernelPackage/usb-serial-ftdi
  $(call usbdep,kmod-usb-serial)
  TITLE:=Support for FTDI devices
-  DESCRIPTION:=Kernel support for FTDI USB-to-Serial converters
  KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO
  FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,ftdi_sio)
 endef

+define KernelPackage/usb-serial-ftdi/description
+ Kernel support for FTDI USB-to-Serial converters
+endef
+
 $(eval $(call KernelPackage,usb-serial-ftdi))


 define KernelPackage/usb-serial-mct
  $(call usbdep,kmod-usb-serial)
  TITLE:=Support for Magic Control Tech. devices
-  DESCRIPTION:=Kernel support for Magic Control Technology USB-to-Serial converters
  KCONFIG:=CONFIG_USB_SERIAL_MCT_U232
  FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,mct_u232)
 endef

+define KernelPackage/usb-serial-mct/description
+ Kernel support for Magic Control Technology USB-to-Serial converters
+endef
+
 $(eval $(call KernelPackage,usb-serial-mct))


 define KernelPackage/usb-serial-pl2303
  $(call usbdep,kmod-usb-serial)
  TITLE:=Support for Prolific PL2303 devices
-  DESCRIPTION:=Kernel support for Prolific PL2303 USB-to-Serial converters
  KCONFIG:=CONFIG_USB_SERIAL_PL2303
  FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,pl2303)
 endef

+define KernelPackage/usb-serial-pl2303/description
+ Kernel support for Prolific PL2303 USB-to-Serial converters
+endef
+
 $(eval $(call KernelPackage,usb-serial-pl2303))


 define KernelPackage/usb-serial-sierrawireless
  $(call usbdep,kmod-usb-serial @LINUX_2_6)
  TITLE:=Support for Sierra Wireless devices
-  DESCRIPTION:=Kernel support for Sierra Wireless devices
  KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS
  FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,sierra)
 endef

+define KernelPackage/usb-serial-sierrawireless/description
+ Kernel support for Sierra Wireless devices
+endef
+
 $(eval $(call KernelPackage,usb-serial-sierrawireless))


 define KernelPackage/usb-serial-visor
  $(call usbdep,kmod-usb-serial)
  TITLE:=Support for Handspring Visor devices
-  DESCRIPTION:=Kernel support for Handspring Visor PDAs
  KCONFIG:=CONFIG_USB_SERIAL_VISOR
  FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,visor)
 endef

+define KernelPackage/usb-serial-visor/description
+ Kernel support for Handspring Visor PDAs
+endef
+
 $(eval $(call KernelPackage,usb-serial-visor))


 define KernelPackage/usb-serial-keyspan
  $(call usbdep,kmod-usb-serial)
  TITLE:=Support for Keyspan USB-to-Serial devices
-  DESCRIPTION:=Kernel support for Keyspan USB-to-Serial devices
  KCONFIG:= \
 	CONFIG_USB_SERIAL_KEYSPAN \
 	CONFIG_USB_SERIAL_KEYSPAN_USA28 \
@ -307,97 +357,122 @@ define KernelPackage/usb-serial-keyspan
  AUTOLOAD:=$(call AutoLoad,65,keyspan)
 endef

+define KernelPackage/usb-serial-keyspan/description
+ Kernel support for Keyspan USB-to-Serial devices
+endef
+
 $(eval $(call KernelPackage,usb-serial-keyspan))


 define KernelPackage/usb-serial-option
  $(call usbdep,kmod-usb-serial @LINUX_2_6)
  TITLE:=Support for Option HSDPA modems
-  DESCRIPTION:=Kernel support for Option HSDPA modems
  KCONFIG:=CONFIG_USB_SERIAL_OPTION
  FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,65,option)
 endef

+define KernelPackage/usb-serial-option/description
+ Kernel support for Option HSDPA modems
+endef
+
 $(eval $(call KernelPackage,usb-serial-option))


 define KernelPackage/usb-storage
  $(call usbdep,+kmod-scsi-core)
  TITLE:=USB Storage support
-  DESCRIPTION:=Kernel support for USB Mass Storage devices
  KCONFIG:=CONFIG_USB_STORAGE
  FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage)
 endef

+define KernelPackage/usb-storage/description
+ Kernel support for USB Mass Storage devices
+endef
+
 $(eval $(call KernelPackage,usb-storage))


 define KernelPackage/usb-atm
  $(call usbdep,@LINUX_2_6 kmod-atm)
  TITLE:=Support for ATM on USB bus
-  DESCRIPTION:=Kernel support for USB DSL modems
  KCONFIG:=CONFIG_USB_ATM
  FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,60,usbatm)
 endef

+define KernelPackage/usb-atm/description
+ Kernel support for USB DSL modems
+endef
+
 $(eval $(call KernelPackage,usb-atm))


 define KernelPackage/usb-speedtouch
  $(call usbdep,@LINUX_2_6 kmod-atm)
  TITLE:=Support for SpeedTouch ADSL modems
-  DESCRIPTION:=Kernel support for SpeedTouch USB ADSL modems
  KCONFIG:=CONFIG_USB_SPEEDTOUCH
  FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,70,speedtch)
 endef

+define KernelPackage/usb-speedtouch/description
+ Kernel support for SpeedTouch USB ADSL modems
+endef
+
 $(eval $(call KernelPackage,usb-speedtouch))


 define KernelPackage/ueagle-atm
  $(call usbdep,@LINUX_2_6 kmod-atm)
  TITLE:=Driver for Eagle 8051 based USB ADSL modems
-  DESCRIPTION:=Kernel support for Eagle 8051 based USB ADSL modems
  FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX)
  KCONFIG:=CONFIG_USB_UEAGLEATM
  AUTOLOAD:=$(call AutoLoad,70,ueagle-atm)
 endef

+define KernelPackage/ueagle-atm/description
+ Kernel support for Eagle 8051 based USB ADSL modems
+endef
+
 $(eval $(call KernelPackage,ueagle-atm))


 define KernelPackage/usb-pwc
  $(call usbdep,+kmod-videodev @LINUX_2_6)
  TITLE:=Philips WebCam driver
-  DESCRIPTION:=Kernel modules for supporting Philips WebCam USB devices
  KCONFIG:=CONFIG_USB_PWC CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y CONFIG_V4L_USB_DRIVERS=y CONFIG_USB_PWC_DEBUG=n
  FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,70,pwc)
 endef

+
+define KernelPackage/usb-pwc/description
+ Kernel modules for supporting Philips WebCam USB devices
+endef
+
 $(eval $(call KernelPackage,usb-pwc))


 define KernelPackage/cpia2
  $(call usbdep,+kmod-videodev @LINUX_2_6)
  TITLE:=CPIA2 video driver
-  DESCRIPTION:=Kernel modules for CPIA2 WebCam devices
  KCONFIG:=CONFIG_VIDEO_CPIA2
  FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,70,cpia2)
 endef

+define KernelPackage/cpia2/description
+ Kernel modules for CPIA2 WebCam devices
+endef
+
 $(eval $(call KernelPackage,cpia2))


 define KernelPackage/usb-net
  $(call usbdep,)
  TITLE:=Kernel modules for USB-to-Ethernet convertors
-  DESCRIPTION:=Kernel modules for USB-to-Ethernet convertors
  KCONFIG:=CONFIG_USB_USBNET
  AUTOLOAD:=$(call Autoload,60, usbnet)
 endef
@ -410,64 +485,84 @@ define KernelPackage/usb-net/2.6
  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/usb-net/description
+ Kernel modules for USB-to-Ethernet convertors
+endef
+
 $(eval $(call KernelPackage,usb-net))


 define KernelPackage/usb-net-asix
  $(call usbdep,kmod-usb-net @LINUX_2_6)
  TITLE:=Kernel module for USB-to-Ethernet Asix convertors
-  DESCRIPTION:=Kernel module for USB-to-Ethernet Asix convertors
  KCONFIG:=CONFIG_USB_NET_AX8817X
  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call Autoload,61,asix)
 endef

+define KernelPackage/usb-net-asix/description
+ Kernel module for USB-to-Ethernet Asix convertors
+endef
+
 $(eval $(call KernelPackage,usb-net-asix))


 define KernelPackage/usb-net-kaweth
  $(call usbdep,kmod-usb-net @LINUX_2_6)
  TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors
-  DESCRIPTION:=Kernel module for USB-to-Ethernet Kaweth convertors
  KCONFIG:=CONFIG_USB_KAWETH
  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call Autoload,61,kaweth)
 endef

+define KernelPackage/usb-net-kaweth/description
+ Kernel module for USB-to-Ethernet Kaweth convertors
+endef
+
 $(eval $(call KernelPackage,usb-net-kaweth))


 define KernelPackage/usb-net-pegasus
  $(call usbdep,kmod-usb-net @LINUX_2_6)
  TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors
-  DESCRIPTION:=Kernel module for USB-to-Ethernet Pegasus convertors
  KCONFIG:=CONFIG_USB_PEGASUS
  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call Autoload,61,pegasus)
 endef

+define KernelPackage/usb-net-pegasus/description
+ Kernel module for USB-to-Ethernet Pegasus convertors
+endef
+
 $(eval $(call KernelPackage,usb-net-pegasus))


 define KernelPackage/usb-hid
  $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
  TITLE:=Support for USB Human Input Devices
-  DESCRIPTION:=Kernel support for USB HID devices such as keyboards and mice
  KCONFIG:=CONFIG_USB_HID
  FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
  AUTOLOAD:=$(call AutoLoad,70,usbhid)
 endef

+
+define KernelPackage/usb-hid/description
+ Kernel support for USB HID devices such as keyboards and mice
+endef
+
 $(eval $(call KernelPackage,usb-hid))


 define KernelPackage/usb-yealink
  $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev)
  TITLE:=USB Yealink VOIP phone
-  DESCRIPTION:=Kernel support for Yealink VOIP phone
  KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y
  FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
  AUTOLOAD:=$(call AutoLoad,70,yealink)
 endef

+define KernelPackage/usb-yealink/description
+ Kernel support for Yealink VOIP phone
+endef
+
 $(eval $(call KernelPackage,usb-yealink))
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@ -11,14 +11,6 @@ WIMENU:=Wireless Drivers
 define KernelPackage/ieee80211
  SUBMENU:=$(WIMENU)
  TITLE:=802.11 Networking stack
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ieee80211_crypt \\\
-	- ieee80211 \\\
-	- ieee80211_crypt_wep \\\
-	- ieee80211_crypt_tkip \\\
-	- ieee80211_crytp_ccmp
  DEPENDS:=@LINUX_2_6 +kmod-crypto
  KCONFIG:= \
 	CONFIG_IEEE80211 \
@ -40,6 +32,16 @@ define KernelPackage/ieee80211
  )
 endef

+define KernelPackage/ieee80211/description
+ Kernel modules for 802.11 Networking stack
+ Includes:  
+ - ieee80211_crypt  
+ - ieee80211  
+ - ieee80211_crypt_wep  
+ - ieee80211_crypt_tkip  
+ - ieee80211_crytp_ccmp
+endef
+
 $(eval $(call KernelPackage,ieee80211))


@ -52,73 +54,85 @@ define KernelPackage/ieee80211-softmac
  AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
 endef

+define KernelPackage/ieee80211-softmac/description
+ Kernel modules for 802.11 SoftMAC support
+endef
+
 $(eval $(call KernelPackage,ieee80211-softmac))


 define KernelPackage/net-bcm43xx
  SUBMENU:=$(WIMENU)
  TITLE:=Broadcom BCM43xx driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- bcm43xx
  DEPENDS:=kmod-ieee80211-softmac
  KCONFIG:=CONFIG_BCM43XX
  FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
 endef

+define KernelPackage/net-bcm43xx/description
+ Kernel support for Broadcom BCM43xx
+ Includes:  
+ - bcm43xx
+endef
+
 $(eval $(call KernelPackage,net-bcm43xx))


 define KernelPackage/net-ipw2100
  SUBMENU:=$(WIMENU)
  TITLE:=Intel IPW2100 driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ipw2100
  DEPENDS:=kmod-ieee80211
  KCONFIG:=CONFIG_IPW2100
  FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,ipw2100)
 endef

+define KernelPackage/net-ipw2100/description
+ Kernel support for Intel IPW2100
+ Includes:  
+ - ipw2100
+endef
+
 $(eval $(call KernelPackage,net-ipw2100))


 define KernelPackage/net-ipw2200
  SUBMENU:=$(WIMENU)
  TITLE:=Intel IPW2200 driver
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ipw2200
  DEPENDS:=kmod-ieee80211
  KCONFIG:=CONFIG_IPW2200
  FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,ipw2200)
 endef

+define KernelPackage/net-ipw2200/description
+ Kernel support for Intel IPW2200
+ Includes:  
+ - ipw2200
+endef
+
 $(eval $(call KernelPackage,net-ipw2200))


 define KernelPackage/net-airo
  SUBMENU:=$(WIMENU)
  TITLE:=Cisco Aironet driver
-  DESCRIPTION:=Driver for Cisco Aironet cards
  KCONFIG:=CONFIG_AIRO
  FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,airo)
 endef

+define KernelPackage/net-airo/description
+ Kernel support for Cisco Aironet cards
+endef
+
 $(eval $(call KernelPackage,net-airo))


 define KernelPackage/net-hermes
  SUBMENU:=$(WIMENU)
  TITLE:=Hermes 802.11b chipset support
-  DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
  DEPENDS:=@LINUX_2_6
  KCONFIG:=CONFIG_HERMES
  FILES:= \
@ -127,55 +141,71 @@ define KernelPackage/net-hermes
  AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
 endef

+define KernelPackage/net-hermes/description
+ Kernel support for Hermes 802.11b chipsets
+endef
+
 $(eval $(call KernelPackage,net-hermes))


 define KernelPackage/net-hermes-pci
  SUBMENU:=$(WIMENU)
  TITLE:=Intersil Prism 2.5 PCI support
-  DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
  DEPENDS:=kmod-net-hermes
  KCONFIG:=CONFIG_PCI_HERMES
  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef

+define KernelPackage/net-hermes-pci/description
+ Kernel modules for Intersil Prism 2.5 PCI support
+endef
+
 $(eval $(call KernelPackage,net-hermes-pci))


 define KernelPackage/net-hermes-plx
  SUBMENU:=$(WIMENU)
  TITLE:=PLX9052 based PCI adaptor
-  DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
  DEPENDS:=kmod-net-hermes
  KCONFIG:=CONFIG_PLX_HERMES
  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef

+define KernelPackage/net-hermes-plx/description
+ Kernel modules for Hermes in PLX9052 based PCI adaptors
+endef
+
 $(eval $(call KernelPackage,net-hermes-plx))


 define KernelPackage/net-prism54
  SUBMENU:=$(WIMENU)
  TITLE:=Intersil Prism54 support
-  DESCRIPTION:=Kernel modules for Intersil Prism54 support
  KCONFIG:=CONFIG_PRISM54
  FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef

+define KernelPackage/net-prism54/description
+ Kernel modules for Intersil Prism54 support
+endef
+
 $(eval $(call KernelPackage,net-prism54))


 define KernelPackage/net-zd1211rw
  SUBMENU:=$(WIMENU)
  TITLE:=Zydas ZD1211 support
-  DESCRIPTION:=Kernel modules Zydas ZD1211 support, kernel version
  DEPENDS:=+kmod-ieee80211 +zd1211-firmware @LINUX_2_6
  KCONFIG:=CONFIG_ZD1211RW
  FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
 endef

+define KernelPackage/net-zd1211rw/description
+ Kernel modules for Zydas ZD1211 support, kernel version
+endef
+
 $(eval $(call KernelPackage,net-zd1211rw))
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@ -23,12 +23,14 @@ define Package/kexec-tools
  CATEGORY:=Utilities
  DEPENDS:=@i386 +zlib
  TITLE:=Kernel boots kernel
-  DESCRIPTION:=\
-	kexec is a set of systems call that allows you to load \\\
-	another kernel from the currently executing Linux kernel.
  URL:=http://www.xmission.com/~ebiederm/files/kexec/README
 endef

+define Package/kexec-tools/description
+ kexec is a set of systems call that allows you to load 
+ another kernel from the currently executing Linux kernel.
+endef
+
 MAKE_FLAGS += \
 	DESTDIR="$(PKG_INSTALL_DIR)" \
 	EXTRA_CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@ -23,14 +23,16 @@ define Package/keynote
  CATEGORY:=Network
  DEPENDS:=@LINUX_2_6 +libopenssl
  TITLE:=Simple and flexible trust-management system
-  DESCRIPTION:=\
-	KeyNote is a simple and flexible trust-management system designed to work \\\
-	well for a variety of large- and small- scale Internet-based applications.\\\
-	It provides a single, unified language for both local policies and \\\
-	credentials. 
  URL:=http://www1.cs.columbia.edu/~angelos/keynote.html
 endef

+define Package/keynote/description
+ KeyNote is a simple and flexible trust-management system designed to work 
+ well for a variety of large- and small- scale Internet-based applications.
+ It provides a single, unified language for both local policies and 
+ credentials.
+endef
+
 CONFIGURE_ARGS += \
 	--enable-static \
 	--enable-shared
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@ -22,10 +22,13 @@ define Package/libjson
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=javascript object notation
-  DESCRIPTION:=library for javascript object notation backends
  URL:=http://oss.metaparadigm.com/json-c/
 endef

+define Package/libjson/description
+ This package contains a library for javascript object notation backends.
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@ -22,12 +22,14 @@ define Package/libpcap
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=Low-level packet capture library
-  DESCRIPTION:=\
-	This package contains a system-independent library for user-level \\\
-	network packet capture.
  URL:=http://www.tcpdump.org/
 endef

+define Package/libpcap/description
+ This package contains a system-independent library for user-level network 
+ packet capture.
+endef
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@ -22,8 +22,6 @@ define KernelPackage/mac80211
  TITLE:=Linux 802.11 Wireless Networking Stack
  DEPENDS:=@LINUX_2_6
  KCONFIG:=CONFIG_MAC80211
-  DESCRIPTION:=\
-	This package contains the DeviceScape 80211 wireless stack.
  FILES:= \
 	$(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
@ -32,6 +30,10 @@ define KernelPackage/mac80211
  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
 endef

+define KernelPackage/mac80211/description
+ This package contains the DeviceScape 80211 wireless stack.
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)/mac80211
 	$(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@ -79,8 +79,6 @@ define KernelPackage/madwifi
  SUBMENU:=Wireless Drivers
  TITLE:=Driver for Atheros wireless chipsets
  DEPENDS:=+wireless-tools @!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX
-  DESCRIPTION:=\
-	This package contains a driver for Atheros 802.11a/b/g chipsets.
  URL:=http://madwifi.org/
  FILES:= \
 		$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
@ -90,6 +88,10 @@ define KernelPackage/madwifi
  AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
 endef

+define KernelPackage/madwifi/description
+ This package contains a driver for Atheros 802.11a/b/g chipsets.
+endef
+
 MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
 		PATH="$(TARGET_PATH)" \
 		ARCH="$(LINUX_KARCH)" \
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@ -20,8 +20,10 @@ define Package/mtd
  SECTION:=utils
  CATEGORY:=Base system
  TITLE:=Update utility for trx firmware images
-  DESCRIPTION:=\
-	This package contains an utility useful to upgrade from other firmware or \\\
+endef
+
+define Package/mtd/description
+ This package contains an utility useful to upgrade from other firmware or 
 older OpenWrt releases.
 endef

--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@ -22,7 +22,6 @@ define Package/libncurses
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=Terminal handling library
-  DESCRIPTION:=Terminal handling library
  URL:=http://www.gnu.org/software/ncurses/
 endef

--- a/package/nozomi/Makefile
+++ b/package/nozomi/Makefile
@ -24,7 +24,6 @@ PKG_UNPACK:=mkdir -p $(PKG_BUILD_DIR); gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR)
 define KernelPackage/nozomi
  SUBMENU:=Other modules
  TITLE:=Option Globetrotter HSDPA driver
-  DESCRIPTION:=Option Globetrotter HSDPA driver
  URL:=http://www.pharscape.org/
  DEPENDS:=@LINUX_2_4 @PCMCIA_SUPPORT
  FILES:=$(PKG_BUILD_DIR)/noz.$(LINUX_KMOD_SUFFIX)
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@ -25,11 +25,13 @@ define Package/ntfs-3g
  DEPENDS:=+libfuse +fuse-utils
  SECTION:=utils
  CATEGORY:=Utilities
-  DESCRIPTION:=\
-	Third generation Read/Write NTFS driver
  URL:=http://www.ntfs-3g.org
 endef

+define Package/ntfs-3g/description
+ This package contains the third generation Read/Write NTFS driver
+endef
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
@ -64,6 +66,7 @@ define Package/ntfs-3g/install
 endef

 $(eval $(call BuildPackage,ntfs-3g))
+
 $(eval $(call RequireCommand,pkg-config, \
 	$(PKG_NAME) requires pkg-config. \
 ))
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@ -18,9 +18,10 @@ define Package/nvram
  CATEGORY:=Utilities
  DEPENDS:=@TARGET_BRCM_2_4
  TITLE:=Broadcom config utility
-  DESCRIPTION:=\
-	This package contains an utility to control broadcom's 'nvram' config \\\
-	area.
+endef
+
+define Package/nvram/description
+ This package contains an utility to control broadcom's 'nvram' config area.
 endef

 define Build/Prepare
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@ -23,23 +23,27 @@ include $(INCLUDE_DIR)/package.mk

 define Package/openssl/Default
  TITLE:=Open source SSL toolkit
-  DESCRIPTION:=\
-	The OpenSSL Project is a collaborative effort to develop a robust, \\\
-	commercial-grade, full-featured, and Open Source toolkit implementing the \\\
-	Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) \\\
-	protocols as well as a full-strength general purpose cryptography library.
  URL:=http://www.openssl.org/
 endef

+define Package/openssl/Default/description
+ The OpenSSL Project is a collaborative effort to develop a robust, 
+ commercial-grade, full-featured, and Open Source toolkit implementing the 
+ Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library.
+endef
+
 define Package/libopenssl
 $(call Package/openssl/Default)
  SECTION:=libs
  CATEGORY:=Libraries
  DEPENDS:=+zlib
  TITLE+= (libraries)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the OpenSSL shared libraries, needed by other \\\
+endef
+
+define Package/libopenssl/description
+$(call Package/openssl/Default/description)
+ This package contains the OpenSSL shared libraries, needed by other 
 programs.
 endef

@ -49,15 +53,18 @@ define Package/openssl-util
  CATEGORY:=Utilities
  DEPENDS:=+libopenssl
  TITLE+= (utility)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the OpenSSL command-line utility.
 endef

 define Package/openssl-util/conffiles
 /etc/ssl/openssl.cnf
 endef

+define Package/openssl-util/description
+$(call Package/openssl/Default/description)
+ This package contains the OpenSSL command-line utility.
+endef
+
+
 OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-smime \
 					no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5
 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-threads zlib-dynamic \
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@ -21,34 +21,41 @@ include $(INCLUDE_DIR)/package.mk

 define Package/openswan/Default
  TITLE:=Openswan
-  DESCRIPTION:=\
-	Openswan is an IPsec implementation for Linux.
  URL:=http://www.openswan.org/
 endef

+define Package/openswan/Default/description
+ Openswan is an IPsec implementation for Linux.
+endef
+
 define Package/openswan
 $(call Package/openswan/Default)
  SECTION:=net
  CATEGORY:=Network
  DEPENDS:=@LINUX_2_4 +kmod-openswan +libgmp +ip
  TITLE+= (daemon)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the Openswan user-land daemon.
  URL:=http://www.openswan.org/
 endef

+define Package/openswan/description
+$(call Package/openswan/Default/description)
+ This package contains the Openswan user-land daemon.
+endef
+
 define KernelPackage/openswan
-  SUBMENU:=Network Support
 $(call Package/openswan/Default)
+  SUBMENU:=Network Support
  DEPENDS:=@LINUX_2_4 
  TITLE+= (kernel module)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the Openswan kernel module.
  FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
 endef

+define KernelPackage/openswan/description
+$(call Package/openswan/Default/description)
+ This package contains the Openswan kernel module.
+endef
+
+
 PKG_MAKE_OPTS:= \
 		LINUX_RELEASE="$(LINUX_RELEASE)" \
 		KERNELSRC="$(LINUX_DIR)" \
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@ -31,16 +31,20 @@ define Package/ppp
 $(call Package/ppp/Default)
  DEPENDS:=+kmod-ppp
  TITLE:=PPP daemon
-  DESCRIPTION:=\
-	This package contains the PPP (Point-to-Point Protocol) daemon.
  MENU:=1
 endef

+define Package/ppp/description
+ This package contains the PPP (Point-to-Point Protocol) daemon.
+endef
+
 define Package/ppp-mod-pppoa
 $(call Package/ppp/Default)
  DEPENDS:=ppp +linux-atm +kmod-pppoa
  TITLE:=PPPoA plugin
-  DESCRIPTION:=\
+endef
+
+define Package/ppp-mod-pppoa/description
 This package contains a PPPoA (PPP over ATM) plugin for ppp.
 endef

@ -48,7 +52,9 @@ define Package/ppp-mod-pppoe
 $(call Package/ppp/Default)
  DEPENDS:=ppp +kmod-pppoe
  TITLE:=PPPoE plugin
-  DESCRIPTION:=\
+endef
+
+define Package/ppp-mod-pppoe/description
 This package contains a PPPoE (PPP over Ethernet) plugin for ppp.
 endef

@ -56,8 +62,10 @@ define Package/ppp-mod-radius
 $(call Package/ppp/Default)
  DEPENDS:=ppp
  TITLE:=RADIUS plugin
-  DESCRIPTION:=\
-	This package contains a RADIUS (Remote Authentication Dial-In User \\\
+endef
+
+define Package/ppp-mod-radius/description
+ This package contains a RADIUS (Remote Authentication Dial-In User 
 Service) plugin for ppp.
 endef

@ -65,8 +73,10 @@ define Package/chat
 $(call Package/ppp/Default)
  DEPENDS:=ppp
  TITLE:=Establish conversation with a modem
-  DESCRIPTION:=\
-	This package contains an utility to establish conversation with other \\\
+endef
+
+define Package/chat/description
+ This package contains an utility to establish conversation with other 
 PPP servers (via a modem).
 endef

@ -74,7 +84,9 @@ define Package/pppdump
 $(call Package/ppp/Default)
  DEPENDS:=ppp
  TITLE:=Read PPP record file
-  DESCRIPTION:=\
+endef
+
+define Package/pppdump/description
 This package contains an utility to read PPP record file.
 endef

@ -82,10 +94,13 @@ define Package/pppstats
 $(call Package/ppp/Default)
  DEPENDS:=ppp
  TITLE:=Report PPP statistics
-  DESCRIPTION:=\
+endef
+
+define Package/pppstats/description
 This package contains an utility to report PPP statistics.
 endef

+
 define Build/Configure
 $(call Build/Configure/Default,, \
 	UNAME_S="Linux" \
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@ -22,11 +22,13 @@ define Package/pptp
  SECTION:=net
  CATEGORY:=Network
  TITLE:=PPTP client
-  DESCRIPTION:=\
-	This package contains a PPTP (Point-to-Point Tunneling Protocol) client.
  URL:=http://pptpclient.sourceforge.net/
 endef

+define Package/pptp/daemon
+ This package contains a PPTP (Point-to-Point Tunneling Protocol) client.
+endef
+
 define Package/pptp/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@ -19,28 +19,36 @@ PKG_MD5SUM:=6f6787e1dda11ca3b936ad434154f426

 include $(INCLUDE_DIR)/package.mk

-define Package/qc-usb-utils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Utility programs for the qc-usb kernel module
-  DESCRIPTION:=\
-  	Utilities to tweak parameters of your QuickCam Express or \\\
-  	similar webcam. These programs are completely useless without a \\\
-  	qc-usb-modules package.
+define Package/qc-usb/Default
  URL:=http://qce-ga.sourceforge.net/
 endef

+define Package/qc-usb-utils
+$(call Package/qc-usb/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Utility programs for the qc-usb kernel module
+endef
+
+define Package/qc-usb-utils/description
+ Utilities to tweak parameters of your QuickCam Express or similar webcam. 
+ These programs are completely useless without a qc-usb-modules package.
+endef
+
 define KernelPackage/usb-qc
+$(call Package/qc-usb/Default)
  TITLE:=Support for USB QuickCam Express webcam
-  DESCRIPTION:=\
-	Kernel support for Logitech's QuickCam Express webcam and \\\
-	other webcams with similar chipsets.
  SUBMENU:=USB Support
  DEPENDS:=@LINUX_2_6 @USB_SUPPORT kmod-usb-core +kmod-videodev
  FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef

+define KernelPackage/usb-qc/description
+ Kernel support for Logitech's QuickCam Express webcam and other webcams 
+ with similar chipsets.
+endef
+
 ifneq ($(CONFIG_PACKAGE_kmod-usb-qc),)
  define Build/Compile/kmod
 	$(MAKE) -C $(LINUX_DIR) \
--- a/package/qos-scripts/Makefile
+++ b/package/qos-scripts/Makefile
@ -21,10 +21,12 @@ define Package/qos-scripts
  CATEGORY:=Base system
  DEPENDS:=+tc +kmod-sched +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack +iptables-mod-imq
  TITLE:=QoS scripts
-  DESCRIPTION:=QoS scripts \\\
-	 A set of scripts that abstract QoS configuration \\\
-	 into a simple configuration file supporting stanzas that specify \\\
-	 any number of QoS entries.
+endef
+
+define Package/qos-scripts/description
+ A set of scripts that abstract QoS configuration into a simple 
+ configuration file supporting stanzas that specify any number of QoS 
+ entries.
 endef

 define Build/Prepare
--- a/package/robocfg/Makefile
+++ b/package/robocfg/Makefile
@ -20,8 +20,10 @@ define Package/robocfg
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=BCM5325E/536x switch configuration utility
-  DESCRIPTION:=\
-	This package contains an utility for configuring the Broadcom BCM5325E/536x \\\
+endef
+
+define Package/robocfg/description
+ This package contains an utility for configuring the Broadcom BCM5325E/536x 
 based switches.
 endef

--- a/package/rt2500/Makefile
+++ b/package/rt2500/Makefile
@ -21,16 +21,17 @@ include $(INCLUDE_DIR)/package.mk

 define KernelPackage/rt2500
  SUBMENU:=Wireless Drivers
-  TITLE:=Driver for ralink pci wireless chipsets
+  TITLE:=Driver for Ralink RT2500 pci wireless chipsets
  DEPENDS:=@!BIG_ENDIAN @USB_SUPPORT +wireless-tools
-  DESCRIPTION:=\
-	This package contains a driver for ralink rt2500 pci chipsets.
  URL:=http://rt2x00.serialmonkey.com/
-  FILES:= \
-		$(PKG_BUILD_DIR)/Module/rt2500.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(PKG_BUILD_DIR)/Module/rt2500.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,rt2500)
 endef

+define KernelPackage/rt2500/description
+ This package contains a driver for Ralink RT2500 pci chipsets.
+endef
+
 define Build/Compile
 	$(MAKE) -C "$(PKG_BUILD_DIR)/Module" \
 		CC="$(TARGET_CC)" \
--- a/package/rt2570/Makefile
+++ b/package/rt2570/Makefile
@ -21,16 +21,17 @@ include $(INCLUDE_DIR)/package.mk

 define KernelPackage/rt2570
  SUBMENU:=Wireless Drivers
-  TITLE:=Driver for ralink usb wireless chipsets
+  TITLE:=Driver for Ralink RT2570 usb wireless chipsets
  DEPENDS:=@LINUX_2_4 @USB_SUPPORT +wireless-tools
-  DESCRIPTION:=\
-	This package contains a driver for ralink rt2570 usb chipsets.
  URL:=http://rt2x00.serialmonkey.com/
-  FILES:= \
-		$(PKG_BUILD_DIR)/Module/rt2570.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(PKG_BUILD_DIR)/Module/rt2570.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,rt2570)
 endef

+define KernelPackage/rt2570/description
+ This package contains a driver for Ralink RT2570 usb chipsets.
+endef
+
 define Build/Compile
 	$(MAKE) -C "$(PKG_BUILD_DIR)/Module" \
 		CC="$(TARGET_CC)" \
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@ -30,7 +30,6 @@ define KernelPackage/rt2x00/Default
  TITLE:=Ralink Drivers for RT2x00 cards
  DEPENDS:=@LINUX_2_6
  KCONFIG:=CONFIG_MAC80211
-  DESCRIPTION:=Ralink GPL Drivers for rt2x00 cards
 endef

 define KernelPackage/rt2x00-lib
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@ -21,33 +21,39 @@ include $(INCLUDE_DIR)/package.mk

 define Package/shfs/Default
  TITLE:=ShFS
-  DESCRIPTION:=\
-	ShFS is a simple and easy to use Linux kernel module which allows you to \\\
-	mount remote filesystems using a plain shell (SSH) connection. When using \\\
-	ShFS, you can access all remote files just like the local ones, only the \\\
-	access is governed through the transport security of SSH.
  URL:=http://shfs.sourceforge.net/
 endef

+define Package/shfs/Default/description
+ ShFS is a simple and easy to use Linux kernel module which allows you to 
+ mount remote filesystems using a plain shell (SSH) connection. When using 
+ ShFS, you can access all remote files just like the local ones, only the 
+ access is governed through the transport security of SSH.
+endef
+
 define KernelPackage/shfs
 $(call Package/shfs/Default)
  TITLE+= (kernel module)
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the ShFS kernel module.
  FILES:=$(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX)
  SUBMENU:=Filesystems
  AUTOLOAD:=$(call AutoLoad,40,shfs)
 endef

+define KernelPackage/shfs/description
+$(call Package/shfs/Default/description)
+ This package contains the ShFS kernel module.
+endef
+
 define Package/shfs-utils
 $(call Package/shfs/Default)
  SECTION:=utils
  CATEGORY:=Utilities
  DEPENDS+=+kmod-shfs
  TITLE+= (utilities)
-  DESCRIPTION+=\\\
-	\\\
+endef
+
+define Package/shfs-utils/description
+$(call Package/shfs/Default/description)
 This package contains the ShFS utilities.
 endef

--- a/package/spca5xx-view/Makefile
+++ b/package/spca5xx-view/Makefile
@ -25,9 +25,11 @@ define Package/spca5xx-view
  CATEGORY:=Utilities
  TITLE:=spca5xx streaming applicaton
  DEPENDS:=+kmod-spca5xx-le +libpthread
-  DESCRIPTION:=\
+  URL:=http://www.acmesystems.it/
+endef
+
+define Package/spca5xx-view/description
 This package contains a streaming daemon for spca5xx based webcams 
-  URL:=http://www.acmesystems.it
 endef

 define Build/Compile
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@ -22,35 +22,40 @@ include $(INCLUDE_DIR)/package.mk
 define Package/strongswan/Default
  TITLE:=strongSwan
  DEPENDS:=@LINUX_2_4
-  DESCRIPTION:=\
-	strongSwan is an IPsec implementation for Linux.
  URL:=http://www.strongswan.org/
 endef

+define Package/strongswan/Default/descritpion
+ strongSwan is an IPsec implementation for Linux.
+endef
+
 define Package/strongswan
 $(call Package/strongswan/Default)
  SECTION:=net
  CATEGORY:=Network
  DEPENDS:=+kmod-strongswan +libgmp @LINUX_2_4
  TITLE+= (daemon)
-  DESCRIPTION+=\\\
-	\\\
+endef
+
+define Package/strongswan/description
+$(call Package/strongswan/Default/description)
 This package contains the strongSwan user-land daemon.
-  URL:=http://www.strongswan.org/
 endef

 define KernelPackage/strongswan
-  SUBMENU:=Network Support
 $(call Package/strongswan/Default)
+  SUBMENU:=Network Support
  TITLE+= (kernel module)
  DEPENDS:=@LINUX_2_4
-  DESCRIPTION+=\\\
-	\\\
-	This package contains the strongSwan kernel module.
  FILES:=$(PKG_BUILD_DIR)/linux/net/ipsec/ipsec.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,50,ipsec)
 endef

+define KernelPackage/strongswan/description
+$(call Package/strongswan/Default/description)
+ This package contains the strongSwan kernel module.
+endef
+
 PKG_MAKE_OPTS:= \
 		LINUX_RELEASE="$(LINUX_RELEASE)" \
 		KERNELSRC="$(LINUX_DIR)" \
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@ -18,8 +18,6 @@ define KernelPackage/switch
  SUBMENU:=Other modules
  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX
  TITLE:=Switch drivers
-  DESCRIPTION:=\
-	This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch.
  FILES:= \
 	$(PKG_BUILD_DIR)/switch-core.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/switch-adm.$(LINUX_KMOD_SUFFIX) \
@ -27,6 +25,10 @@ define KernelPackage/switch
  AUTOLOAD:=$(call AutoLoad,20,switch-core switch-robo switch-adm)
 endef

+define KernelPackage/switch/description
+ This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch.
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@ -23,13 +23,15 @@ define Package/udev
  CATEGORY:=Utilities
  DEPENDS:=@LINUX_2_6
  TITLE:=Dynamic device management subsystem
-  DESCRIPTION:=\
-	udev provides a dynamic device directory containing only the files for \\\
-	actually present devices. It creates or removes device node files in \\\
-	the /dev directory, or it renames network interfaces.
  URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 endef

+define Package/udev/description
+ udev provides a dynamic device directory containing only the files for 
+ actually present devices. It creates or removes device node files in 
+ the /dev directory, or it renames network interfaces.
+endef
+
 define Package/udevtrigger
 $(call Package/udev)
  TITLE:=Small utility to request kernel devices events for coldplug
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@ -28,42 +28,50 @@ endef
 define Package/fdisk
 $(call Package/util-linux/Default)
  TITLE:=Partition table manipulation utility
-  DESCRIPTION:=\
+endef
+
+define Package/fdisk/description
 This package contains a utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef

 define Package/cfdisk
 $(call Package/util-linux/Default)
  TITLE:=Partition table manipulation utility
-  DEPENDS+= +libncurses
-  DESCRIPTION:=\
+  DEPENDS:= +libncurses
+endef
+
+define Package/cfdisk/description
 This package contains a utility for managing disk partition tables.
-  URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef

 define Package/losetup
 $(call Package/util-linux/Default)
  TITLE:=Loopback devices setup and control utility
-  DESCRIPTION:=\
+endef
+
+define Package/losetup/description
 This package contains a utility for managing loopback devices.
 endef

 define Package/swap-utils
 $(call Package/util-linux/Default)
  TITLE:=Swap space management utilities
-  DESCRIPTION:=\
-	This package contains a collection of tools for managing swap space: \\\
-	- mkswap\\\
-	- swapon\\\
+endef
+
+define Package/swap-utils/description
+ This package contains a collection of tools for managing swap space: 
+ - mkswap
+ - swapon
 - swapoff
 endef

 define Package/hwclock
 $(call Package/util-linux/Default)
  TITLE:=Utilities for managing the hardware clock
-  DESCRIPTION:=\
-  	 This package contains a utility for managing the hardware clock
+endef
+
+define Package/hwclock/description
+ This package contains a utility for managing the hardware clock.
 endef

 define Build/Configure
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@ -26,12 +26,14 @@ define Package/wireless-tools
  SECTION:=net
  CATEGORY:=Base system
  TITLE:=Tools for manipulating Linux Wireless Extensions
-  DESCRIPTION:=\
-	This package contains a collection of tools for configuring wireless \\\
-	adapters implementing the "Linux Wireless Extensions".
  URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 endef

+define Package/wireless-tools/description
+ This package contains a collection of tools for configuring wireless 
+ adapters implementing the "Linux Wireless Extensions".
+endef
+
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
--- a/package/wlcompat/Makefile
+++ b/package/wlcompat/Makefile
@ -19,8 +19,10 @@ define KernelPackage/wlcompat/Default
  SUBMENUDEP:=@TARGET_BRCM_2_4
  DEPENDS:=@TARGET_BRCM_2_4 @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools
  TITLE:=Broadcom wl wrapper module
-  DESCRIPTION:=\
-	This package contains a wrapper module, that provides Wireless Extension \\\
+endef
+
+define KernelPackage/wlcompat/Default/description
+ This package contains a wrapper module, that provides Wireless Extension 
 support for the proprietary Broadcom wl module.
 endef

@ -30,15 +32,21 @@ define KernelPackage/wlcompat
  AUTOLOAD:=$(call AutoLoad,50,wlcompat)
 endef

+define KernelPackage/wlcompat/description
+$(call KernelPackage/wlcompat/Default/description)
+endef
+
 define KernelPackage/wlcompat-debug
 $(call KernelPackage/wlcompat/Default)
  TITLE+= (debug)
-  DESCRIPTION+=\\\
-	\\\
-	This is a debugging version.
  FILES:=$(PKG_BUILD_DIR)/wlcompat-debug.o
 endef

+define KernelPackage/wlcompat-debug/description
+$(call KernelPackage/wlcompat/Default/description)
+ This is a debugging version.
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
--- a/package/zd1211-driver/Makefile
+++ b/package/zd1211-driver/Makefile
@ -24,20 +24,27 @@ define KernelPackage/zd1211
  SUBMENU:=Wireless Drivers
  DEPENDS:=@LINUX_2_6 @USB_SUPPORT
  TITLE:=Driver for Zydas 1211 based USB devices
-  DESCRIPTION:=\
-	This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\
-	USB-WLAN-Chip.\\\
-	Initially contributed by ZyDAS, this driver is actively maintained by the \\\
-	open source community.
  FILES:=$(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX)
  AUTOLOAD:=$(call AutoLoad,60,zd1211) 
 endef

+define KernelPackage/zd1211/description
+ This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g 
+ USB-WLAN-Chip.
+ Initially contributed by ZyDAS, this driver is actively maintained by the 
+ open source community.
+endef
+
 define Package/zd1211-utils
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=zd1211 user-space utilities
-  DESCRIPTION:=zd1211 user-space utilities : apdbg, zd1211-sta
+endef
+
+define Package/zd1211-utils/description
+  zd1211 user-space utilities : 
+ - apdbg
+ - zd1211-sta
 endef

 define Build/Compile