X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c8629107bd68de89f8fd978a572909171ca11e22..657d28dfa3b93588deb46ed29a379f113d40cda8:/package/kernel/modules/other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 62fd2994b..08b470de2 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -11,81 +11,40 @@ EMENU:=Other modules
 define KernelPackage/crypto
   TITLE:=CryptoAPI modules
   KCONFIG:= \
-	$(CONFIG_CRYPTO_HMAC) \
-	$(CONFIG_CRYPTO_NULL) \
-	$(CONFIG_CRYPTO_MD4) \
-	$(CONFIG_CRYPTO_MD5) \
-	$(CONFIG_CRYPTO_SHA1) \
-	$(CONFIG_CRYPTO_SHA256) \
-	$(CONFIG_CRYPTO_SHA512) \
-	$(CONFIG_CRYPTO_WP512) \
-	$(CONFIG_CRYPTO_TGR192) \
-	$(CONFIG_CRYPTO_DES) \
-	$(CONFIG_CRYPTO_BLOWFISH) \
-	$(CONFIG_CRYPTO_TWOFISH) \
-	$(CONFIG_CRYPTO_SERPENT) \
-	$(CONFIG_CRYPTO_AES) \
-	$(CONFIG_CRYPTO_CAST5) \
-	$(CONFIG_CRYPTO_CAST6) \
-	$(CONFIG_CRYPTO_TEA) \
-	$(CONFIG_CRYPTO_ARC4) \
-	$(CONFIG_CRYPTO_KHAZAD) \
-	$(CONFIG_CRYPTO_ANUBIS) \
-	$(CONFIG_CRYPTO_DEFLATE) \
-	$(CONFIG_CRYPTO_MICHAEL_MIC) \
-	$(CONFIG_CRYPTO_CRC32C)
+	CONFIG_CRYPTO_HMAC \
+	CONFIG_CRYPTO_NULL \
+	CONFIG_CRYPTO_MD4 \
+	CONFIG_CRYPTO_MD5 \
+	CONFIG_CRYPTO_SHA1 \
+	CONFIG_CRYPTO_SHA256 \
+	CONFIG_CRYPTO_SHA512 \
+	CONFIG_CRYPTO_WP512 \
+	CONFIG_CRYPTO_TGR192 \
+	CONFIG_CRYPTO_DES \
+	CONFIG_CRYPTO_BLOWFISH \
+	CONFIG_CRYPTO_TWOFISH \
+	CONFIG_CRYPTO_SERPENT \
+	CONFIG_CRYPTO_AES \
+	CONFIG_CRYPTO_CAST5 \
+	CONFIG_CRYPTO_CAST6 \
+	CONFIG_CRYPTO_TEA \
+	CONFIG_CRYPTO_ARC4 \
+	CONFIG_CRYPTO_KHAZAD \
+	CONFIG_CRYPTO_ANUBIS \
+	CONFIG_CRYPTO_DEFLATE \
+	CONFIG_CRYPTO_MICHAEL_MIC \
+	CONFIG_CRYPTO_CRC32C \
+	CONFIG_CRYPTO_ECB \
+	CONFIG_CRYPTO_BLKCIPHER 
   FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(EMENU)
 endef
 $(eval $(call KernelPackage,crypto))
 
-define KernelPackage/ide-core
-  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)
-  FILES:=$(LINUX_DIR)/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk)
-endef
-$(eval $(call KernelPackage,ide-core))
-
-define KernelPackage/ide-pdc202xx
-  TITLE:=PDC202xx IDE driver
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD)
-  FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
-endef
-$(eval $(call KernelPackage,ide-pdc202xx))
-
-define KernelPackage/ide-aec62xx
-  TITLE:=AEC62xx IDE driver
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_BLK_DEV_AEC62XX)
-  FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,aec62xx)
-endef
-$(eval $(call KernelPackage,ide-aec62xx))
-
-define KernelPackage/scsi-core
-  TITLE:=Kernel support for SCSI
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_BLK_DEV_SD)
-  FILES:= \
-    $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
-    $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
-endef
-$(eval $(call KernelPackage,scsi-core))
-
 define KernelPackage/lp
   TITLE:=Parallel port and line printer support
-  KCONFIG:=$(CONFIG_PARPORT)
+  DEPENDS:=@LINUX_2_4
+  KCONFIG:=CONFIG_PARPORT
   FILES:= \
 	$(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
@@ -102,7 +61,7 @@ $(eval $(call KernelPackage,lp))
 define KernelPackage/soundcore
   TITLE:=Sound support
   DESCRIPTION:=Kernel modules for sound support
-  KCONFIG:=$(CONFIG_SOUND)
+  KCONFIG:=CONFIG_SOUND
   SUBMENU:=$(EMENU)
 endef
 
@@ -115,8 +74,8 @@ define KernelPackage/soundcore/2.6
   FILES:= \
 	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/sound/core/*.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/sound/core/oss/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm snd-mixer-oss snd-pcm-oss)
+	$(if $(CONFIG_SND_MIXER_OSS)$(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/*.$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss))
 endef
 
 define KernelPackage/soundcore/uml-2.6
@@ -132,7 +91,7 @@ $(eval $(call KernelPackage,soundcore))
 define KernelPackage/loop
   TITLE:=Loopback device support
   DESCRIPTION:=Kernel module for loopback device support
-  KCONFIG:=$(CONFIG_BLK_DEV_LOOP)
+  KCONFIG:=CONFIG_BLK_DEV_LOOP
   SUBMENU:=$(EMENU)
   AUTOLOAD:=$(call AutoLoad,30,loop)
   FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
@@ -142,7 +101,7 @@ $(eval $(call KernelPackage,loop))
 define KernelPackage/nbd
   TITLE:=Network block device support
   DESCRIPTION:=Kernel module for network block device support
-  KCONFIG:=$(CONFIG_BLK_DEV_NBD)
+  KCONFIG:=CONFIG_BLK_DEV_NBD
   SUBMENU:=$(EMENU)
   AUTOLOAD:=$(call AutoLoad,30,nbd)
   FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
@@ -152,7 +111,8 @@ $(eval $(call KernelPackage,nbd))
 define KernelPackage/capi
   TITLE:=CAPI Support
   DESCRIPTION:=Kernel module for basic CAPI support
-  KCONFIG:=$(CONFIG_ISDN) $(CONFIG_ISDN_CAPI) $(CONFIG_ISDN_CAPI_CAPI20)
+  KCONFIG:=CONFIG_ISDN CONFIG_ISDN_CAPI CONFIG_ISDN_CAPI_CAPI20
+  DEPENDS:=@LINUX_2_6
   SUBMENU:=$(EMENU)
   AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
   FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX)
@@ -163,10 +123,10 @@ define KernelPackage/pcmcia-core
   TITLE:=PCMCIA/CardBus support
   DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
   SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_PCMCIA CONFIG_PCCARD
 endef
 
 define KernelPackage/pcmcia-core/2.4
-  KCONFIG:=$(CONFIG_PCMCIA)
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
@@ -175,7 +135,6 @@ define KernelPackage/pcmcia-core/2.4
 endef
 
 define KernelPackage/pcmcia-core/2.6
-  KCONFIG:=$(CONFIG_PCCARD)
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
 	$(if $(CONFIG_PCMCIA),$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX)) \
@@ -192,15 +151,14 @@ define KernelPackage/pcmcia-serial
   DEPENDS:=kmod-pcmcia-core
   SUBMENU:=$(EMENU)
   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
+  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS CONFIG_SERIAL_8250_CS
 endef
 
 define KernelPackage/pcmcia-serial/2.4
-  KCONFIG:=$(CONFIG_PCMCIA_SERIAL_CS)
   FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef
 
 define KernelPackage/pcmcia-serial/2.6
-  KCONFIG:=$(CONFIG_SERIAL_8250_CS)
   FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef
 $(eval $(call KernelPackage,pcmcia-serial))
@@ -211,10 +169,10 @@ define KernelPackage/bluetooth
   DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
   SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_BLUEZ CONFIG_BT
  endef
 
  define KernelPackage/bluetooth/2.4
-  KCONFIG:=$(CONFIG_BLUEZ)
   FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -227,7 +185,6 @@ define KernelPackage/bluetooth
 endef
 
 define KernelPackage/bluetooth/2.6
-  KCONFIG:=$(CONFIG_BT)
   FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -245,15 +202,12 @@ define KernelPackage/mmc
   DEPENDS:=@LINUX_2_6_AT91
   DESCRIPTION:=Kernel support for MMC/SD cards
   SUBMENU:=$(EMENU)
- endef
-
-define KernelPackage/mmc/2.6
-	KCONFIG:=$(CONFIG_MMC)
-	FILES:= \
+  KCONFIG:=CONFIG_MMC
+  FILES:= \
 	$(LINUX_DIR)/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX)
-	AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
+  AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
 endef
 $(eval $(call KernelPackage,mmc))
 
@@ -261,8 +215,7 @@ define KernelPackage/softdog
   TITLE:=Software watchdog driver
   DESCRIPTION:=Software watchdog driver
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_SOFT_WATCHDOG)
-  FILES:=$(LINUX_DIR)/drivers/char/softdog.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_SOFT_WATCHDOG
   AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
 
@@ -273,16 +226,14 @@ endef
 define KernelPackage/softdog/2.6
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
 endef
-
 $(eval $(call KernelPackage,softdog))
 
 
 define KernelPackage/videodev
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
-  DEPENDS:=@VIDEO_SUPPORT
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_VIDEO_DEV)
+  KCONFIG:=CONFIG_VIDEO_DEV
   FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -298,10 +249,9 @@ $(eval $(call KernelPackage,videodev))
 define KernelPackage/leds-net48xx
   TITLE:=Soekris Net48xx LED support
   DESCRIPTION:=Kernel module for Soekris Net48xx LEDs
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
-  DEPENDS:=@LINUX_2_6_X86_Soekris
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_LEDS_NET48XX)
+  KCONFIG:=CONFIG_LEDS_NET48XX
   FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
 endef
@@ -310,10 +260,9 @@ $(eval $(call KernelPackage,leds-net48xx))
 define KernelPackage/nsc-gpio
   TITLE:=Natsemi GPIO support
   DESCRIPTION:=Kernel module for Natsemi GPIO
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
-  DEPENDS:=@LINUX_2_6_X86_Soekris
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_NSC_GPIO)
+  KCONFIG:=CONFIG_NSC_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
 endef
@@ -322,10 +271,9 @@ $(eval $(call KernelPackage,nsc-gpio))
 define KernelPackage/scx200-gpio
   TITLE:=Natsemi SCX200 GPIO support
   DESCRIPTION:=Kernel module for SCX200 GPIO
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
-  DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86_Soekris
+  DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_SCx200_GPIO)
+  KCONFIG:=CONFIG_SCx200_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
 endef
@@ -334,10 +282,9 @@ $(eval $(call KernelPackage,scx200-gpio))
 define KernelPackage/scx200-wdt
   TITLE:=Natsemi SCX200 Watchdog support
   DESCRIPTION:=Kernel module for SCX200 Watchdog
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
-  DEPENDS:=@LINUX_2_6_X86_Soekris
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_SC1200_WDT)
+  KCONFIG:=CONFIG_SC1200_WDT
   FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 endef
@@ -346,9 +293,9 @@ $(eval $(call KernelPackage,scx200-wdt))
 define KernelPackage/hwmon
   TITLE:=Hardware monitoring support
   DESCRIPTION:=Kernel modules for hardware monitoring
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
+  DEPENDS:=@LINUX_2_6
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_HWMON_VID)
+  KCONFIG:=CONFIG_HWMON_VID
   FILES:= \
 	$(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX)
@@ -359,10 +306,9 @@ $(eval $(call KernelPackage,hwmon))
 define KernelPackage/hwmon-pc87360
   TITLE:=PC87360 monitoring support
   DESCRIPTION:=Kernel modules for PC87360 chips
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
   DEPENDS:=kmod-hwmon
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_SENSORS_PC87360)
+  KCONFIG:=CONFIG_SENSORS_PC87360
   FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,pc87360)
 endef
@@ -372,7 +318,8 @@ define KernelPackage/input-core
   TITLE:=Input device core
   DESCRIPTION:=Kernel modules for support of input device
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_INPUT)
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_INPUT
   FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,input-core)
 endef
@@ -383,7 +330,7 @@ define KernelPackage/input-evdev
   DESCRIPTION:=Kernel modules for support of input device events
   DEPENDS:=+kmod-input-core
   SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_INPUT_EVDEV)
+  KCONFIG:=CONFIG_INPUT_EVDEV
   FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,evdev)
 endef