From 720644c3ace1c13cde6f8de55bfce5b22295f9f1 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 28 Aug 2007 11:44:15 +0000
Subject: cosmetic fixes: rearrange KernelPackage definitions

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8520 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules/other.mk | 88 +++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 30 deletions(-)

(limited to 'package/kernel/modules/other.mk')

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 55121a5169..82fe711481 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -9,6 +9,7 @@
 EMENU:=Other modules
 
 define KernelPackage/crypto
+  SUBMENU:=$(EMENU)
   TITLE:=CryptoAPI modules
   KCONFIG:= \
 	CONFIG_CRYPTO_HMAC \
@@ -37,11 +38,13 @@ define KernelPackage/crypto
 	CONFIG_CRYPTO_ECB \
 	CONFIG_CRYPTO_BLKCIPHER 
   FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(EMENU)
 endef
+
 $(eval $(call KernelPackage,crypto))
 
+
 define KernelPackage/lp
+  SUBMENU:=$(EMENU)
   TITLE:=Parallel port and line printer support
   DEPENDS:=@LINUX_2_4
   KCONFIG:=CONFIG_PARPORT
@@ -49,20 +52,17 @@ define KernelPackage/lp
 	$(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,50, \
-  	parport \
-  	lp \
-  )
+  AUTOLOAD:=$(call AutoLoad,50,parport lp)
 endef
+
 $(eval $(call KernelPackage,lp))
 
 
 define KernelPackage/soundcore
+  SUBMENU:=$(EMENU)
   TITLE:=Sound support
   DESCRIPTION:=Kernel modules for sound support
   KCONFIG:=CONFIG_SOUND
-  SUBMENU:=$(EMENU)
 endef
 
 define KernelPackage/soundcore/2.4
@@ -89,41 +89,46 @@ $(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
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,loop)
   FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,loop)
 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
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,nbd)
   FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,nbd)
 endef
+
 $(eval $(call KernelPackage,nbd))
 
+
 define KernelPackage/capi
+  SUBMENU:=$(EMENU)
   TITLE:=CAPI Support
   DESCRIPTION:=Kernel module for basic CAPI support
-  KCONFIG:=CONFIG_ISDN CONFIG_ISDN_CAPI CONFIG_ISDN_CAPI_CAPI20
   DEPENDS:=@LINUX_2_6
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+  KCONFIG:=CONFIG_ISDN CONFIG_ISDN_CAPI CONFIG_ISDN_CAPI_CAPI20
   FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
 endef
+
 $(eval $(call KernelPackage,capi))
 
+
 define KernelPackage/pcmcia-core
   TITLE:=PCMCIA/CardBus support
   DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
   DEPENDS:=@PCMCIA_SUPPORT
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_PCMCIA CONFIG_PCCARD CONFIG_PCMCIA_AU1X00
 endef
 
@@ -148,16 +153,17 @@ define KernelPackage/pcmcia-core/2.6
 	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic $(PCMCIA_SOCKET_DRIVER))
 endef
+
 $(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
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
   KCONFIG:=CONFIG_PCMCIA_SERIAL_CS CONFIG_SERIAL_8250_CS
+  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 
 define KernelPackage/pcmcia-serial/2.4
@@ -167,14 +173,15 @@ endef
 define KernelPackage/pcmcia-serial/2.6
   FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,pcmcia-serial))
 
 
 define KernelPackage/bluetooth
+  SUBMENU:=$(EMENU)
   TITLE:=Bluetooth support
   DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_BLUEZ CONFIG_BT CONFIG_USB_BLUETOOTH
  endef
 
@@ -201,13 +208,15 @@ define KernelPackage/bluetooth/2.6
 	$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb)
 endef
+
 $(eval $(call KernelPackage,bluetooth))
 
+
 define KernelPackage/mmc
+  SUBMENU:=$(EMENU)
   TITLE:=MMC/SD Card Support
   DEPENDS:=@LINUX_2_6_AT91
   DESCRIPTION:=Kernel support for MMC/SD cards
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_MMC
   FILES:= \
 	$(LINUX_DIR)/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \
@@ -215,12 +224,14 @@ define KernelPackage/mmc
 	$(LINUX_DIR)/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
 endef
+
 $(eval $(call KernelPackage,mmc))
 
+
 define KernelPackage/softdog
+  SUBMENU:=$(EMENU)
   TITLE:=Software watchdog driver
   DESCRIPTION:=Software watchdog driver
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SOFT_WATCHDOG
   AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
@@ -232,13 +243,14 @@ endef
 define KernelPackage/softdog/2.6
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
 endef
+
 $(eval $(call KernelPackage,softdog))
 
 
 define KernelPackage/videodev
+  SUBMENU:=$(EMENU)
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_VIDEO_DEV
   FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
 endef
@@ -250,95 +262,111 @@ endef
 define KernelPackage/videodev/2.6
   AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat compat_ioctl32 videodev)
 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
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_LEDS_NET48XX
   FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
 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
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_NSC_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,nsc_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
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SCx200_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,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
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SC1200_WDT
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 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
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_HWMON_VID
   FILES:= \
 	$(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,hwmon hwmon-vid)
 endef
+
 $(eval $(call KernelPackage,hwmon))
 
+
 define KernelPackage/hwmon-pc87360
+  SUBMENU:=$(EMENU)
   TITLE:=PC87360 monitoring support
   DESCRIPTION:=Kernel modules for PC87360 chips
   DEPENDS:=kmod-hwmon
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_SENSORS_PC87360
   FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,pc87360)
 endef
+
 $(eval $(call KernelPackage,hwmon-pc87360))
 
+
 define KernelPackage/input-core
+  SUBMENU:=$(EMENU)
   TITLE:=Input device core
   DESCRIPTION:=Kernel modules for support of input device
-  SUBMENU:=$(EMENU)
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_INPUT
   FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,input-core)
 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
-  SUBMENU:=$(EMENU)
   KCONFIG:=CONFIG_INPUT_EVDEV
   FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,evdev)
 endef
-$(eval $(call KernelPackage,input-evdev))
 
+$(eval $(call KernelPackage,input-evdev))
-- 
cgit v1.2.3