X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/440947abee81dedef1dac901fadc1580a2eef9a8..22b1079a12e6eafca0f98a3a2286959d9b375cb5:/package/kernel/modules/other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 11d1aa8bf..4d657f118 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -1,75 +1,90 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # $Id$
 
-EMENU:=Other modules
+OTHER_MENU:=Other modules
 
 define KernelPackage/crc-itu-t
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC ITU-T V.41 support
-  DESCRIPTION:=Kernel module for CRC ITU-T V.41 support
   KCONFIG:=CONFIG_CRC_ITU_T
   FILES:=$(LINUX_DIR)/lib/crc-itu-t.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,crc-itu-t)
 endef
 
+define KernelPackage/crc-itu-t/description
+ Kernel module for CRC ITU-T V.41 support
+endef
+
 $(eval $(call KernelPackage,crc-itu-t))
 
+define KernelPackage/crc-ccitt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CRC-CCITT support
+  KCONFIG:=CONFIG_CRC_CCITT
+  FILES:=$(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,crc-ccitt)
+endef
 
-define KernelPackage/crypto
-  SUBMENU:=$(EMENU)
-  TITLE:=CryptoAPI modules
-  KCONFIG:= \
-	CONFIG_CRYPTO_HMAC=m \
-	CONFIG_CRYPTO_NULL=m \
-	CONFIG_CRYPTO_MD4=m \
-	CONFIG_CRYPTO_MD5=m \
-	CONFIG_CRYPTO_SHA1=m \
-	CONFIG_CRYPTO_SHA256=m \
-	CONFIG_CRYPTO_SHA512=m \
-	CONFIG_CRYPTO_WP512=m \
-	CONFIG_CRYPTO_TGR192=m \
-	CONFIG_CRYPTO_DES=m \
-	CONFIG_CRYPTO_BLOWFISH=m \
-	CONFIG_CRYPTO_TWOFISH=m \
-	CONFIG_CRYPTO_SERPENT=m \
-	CONFIG_CRYPTO_AES=m \
-	CONFIG_CRYPTO_CAST5=m \
-	CONFIG_CRYPTO_CAST6=m \
-	CONFIG_CRYPTO_TEA=m \
-	CONFIG_CRYPTO_ARC4=m \
-	CONFIG_CRYPTO_KHAZAD=m \
-	CONFIG_CRYPTO_ANUBIS=m \
-	CONFIG_CRYPTO_DEFLATE=m \
-	CONFIG_CRYPTO_MICHAEL_MIC=m \
-	CONFIG_CRYPTO_CRC32C=m \
-	CONFIG_CRYPTO_ECB=m \
-	CONFIG_CRYPTO_BLKCIPHER=m
-  FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX)
-endef
-
-$(eval $(call KernelPackage,crypto))
+define KernelPackage/crc-ccitt/description
+ Kernel module for CRC-CCITT support
+endef
+
+$(eval $(call KernelPackage,crc-ccitt))
+
+
+define KernelPackage/crc7
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CRC7 support
+  KCONFIG:=CONFIG_CRC7
+  FILES:=$(LINUX_DIR)/lib/crc7.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,crc7)
+endef
+
+define KernelPackage/crc7/description
+ Kernel module for CRC7 support
+endef
+
+$(eval $(call KernelPackage,crc7))
+
+
+define KernelPackage/crc16
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CRC16 support
+  KCONFIG:=CONFIG_CRC16
+  FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,crc16)
+endef
+
+define KernelPackage/crc16/description
+ Kernel module for CRC16 support
+endef
+
+$(eval $(call KernelPackage,crc16))
 
 
 define KernelPackage/eeprom-93cx6
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=EEPROM 93CX6 support
-  DESCRIPTION:=Kernel module for EEPROM 93CX6 support
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_EEPROM_93CX6
   FILES:=$(LINUX_DIR)/drivers/misc/eeprom_93cx6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6)
 endef
 
+define KernelPackage/eeprom-93cx6/description
+ Kernel module for EEPROM 93CX6 support
+endef
+
 $(eval $(call KernelPackage,eeprom-93cx6))
 
 
 define KernelPackage/lp
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Parallel port and line printer support
   DEPENDS:=@LINUX_2_4
   KCONFIG:= \
@@ -86,153 +101,41 @@ endef
 $(eval $(call KernelPackage,lp))
 
 
-define KernelPackage/soundcore
-  SUBMENU:=$(EMENU)
-  TITLE:=Sound support
-  KCONFIG:=CONFIG_SOUND
-endef
-
-define KernelPackage/soundcore/2.4
-  FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore)
-endef
-
-define KernelPackage/soundcore/2.6
-  KCONFIG+= \
-	CONFIG_SND \
-	CONFIG_SND_HWDEP \
-	CONFIG_SND_RAWMIDI \
-	CONFIG_SND_TIMER \
-	CONFIG_SND_PCM
-  FILES:= \
-	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \
-	$(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \
-	$(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-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
-  KCONFIG+= \
-	CONFIG_HOSTAUDIO
-  FILES:= \
-	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
-  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
-  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
-  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
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:= \
-	CONFIG_ISDN \
-	CONFIG_ISDN_CAPI \
-	CONFIG_ISDN_CAPI_CAPI20
-  FILES:= \
-	$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX)
-  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)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=PCMCIA/CardBus support
   DEPENDS:=@PCMCIA_SUPPORT
-endef
-
-define KernelPackage/pcmcia-core/2.4
   KCONFIG:= \
 	CONFIG_PCMCIA \
-	CONFIG_CARDBUS
-  FILES:= \
-	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core yenta_socket ds)
-endef
-
-define KernelPackage/pcmcia-core/2.6
-  KCONFIG:= \
+	CONFIG_CARDBUS \
 	CONFIG_PCCARD \
-	CONFIG_PCMCIA \
 	CONFIG_YENTA \
 	CONFIG_PCCARD_NONSTATIC \
 	PCMCIA_DEBUG=n
+endef
+
+define KernelPackage/pcmcia-core/2.4
+#  KCONFIG:= \
+#	CONFIG_PCMCIA \
+#	CONFIG_CARDBUS
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
+	$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core ds)
 endef
 
-define KernelPackage/pcmcia-core/au1000-2.6
+define KernelPackage/pcmcia-core/2.6
+#  KCONFIG:= \
+#	CONFIG_PCCARD \
+#	CONFIG_PCMCIA \
+#	CONFIG_YENTA \
+#	CONFIG_PCCARD_NONSTATIC \
+#	PCMCIA_DEBUG=n
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/au1x00_ss.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic au1x00_ss)
+	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic)
 endef
 
 define KernelPackage/pcmcia-core/description
@@ -242,20 +145,59 @@ endef
 $(eval $(call KernelPackage,pcmcia-core))
 
 
+define KernelPackage/pcmcia-yenta
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=yenta socket driver
+  DEPENDS:=kmod-pcmcia-core
+  KCONFIG:=CONFIG_YENTA
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,yenta_socket)
+endef
+
+$(eval $(call KernelPackage,pcmcia-yenta))
+
+define KernelPackage/pcmcia-au1000
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RMI/AMD Au1000 PCMCIA support
+  DEPENDS:=kmod-pcmcia-core @TARGET_au1000
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/au1x00_ss.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,au1x00_ss)
+endef
+
+$(eval $(call KernelPackage,pcmcia-au1000))
+
+define KernelPackage/pcmcia-bcm63xx
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Broadcom BCM63xx PCMCIA support
+  DEPENDS:=kmod-pcmcia-core @TARGET_brcm63xx
+  KCONFIG:=CONFIG_PCMCIA_BCM63XX
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,bcm63xx_pcmcia)
+endef
+
+define KernelPackage/pcmcia-bcm63xx/description
+  Kernel support for PCMCIA/CardBus controller on the BCM63xx SoC
+endef
+
+$(eval $(call KernelPackage,pcmcia-bcm63xx))
+
 define KernelPackage/pcmcia-serial
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Serial devices support
   DEPENDS:=kmod-pcmcia-core
+  KCONFIG:= \
+	CONFIG_PCMCIA_SERIAL_CS \
+	CONFIG_SERIAL_8250_CS
   AUTOLOAD:=$(call AutoLoad,45,serial_cs)
 endef
 
 define KernelPackage/pcmcia-serial/2.4
-  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
+#  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
+#  KCONFIG:=CONFIG_SERIAL_8250_CS
   FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -265,14 +207,35 @@ endef
 
 $(eval $(call KernelPackage,pcmcia-serial))
 
+define KernelPackage/ssb
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Silicon Sonics Backplane glue code
+  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT @!TARGET_brcm47xx
+  KCONFIG:=\
+	CONFIG_SSB \
+	CONFIG_SSB_B43_PCI_BRIDGE=y \
+	CONFIG_SSB_DRIVER_PCICORE=y \
+	CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y \
+	CONFIG_SSB_PCIHOST=y \
+	CONFIG_SSB_PCIHOST_POSSIBLE=y \
+	CONFIG_SSB_POSSIBLE=y \
+	CONFIG_SSB_SPROM=y \
+	CONFIG_SSB_SILENT=y
+  FILES:=$(LINUX_DIR)/drivers/ssb/ssb.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,29,ssb)
+endef
 
-define KernelPackage/bluetooth
-  SUBMENU:=$(EMENU)
-  TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT
+define KernelPackage/ssb/description
+  Silicon Sonics Backplane glue code.
 endef
 
-define KernelPackage/bluetooth/2.4
+$(eval $(call KernelPackage,ssb))
+
+
+define KernelPackage/bluetooth
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Bluetooth support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
   KCONFIG:= \
 	CONFIG_BLUEZ \
 	CONFIG_BLUEZ_L2CAP \
@@ -280,7 +243,25 @@ define KernelPackage/bluetooth/2.4
 	CONFIG_BLUEZ_RFCOMM \
 	CONFIG_BLUEZ_BNEP \
 	CONFIG_BLUEZ_HCIUART \
-	CONFIG_BLUEZ_HCIUSB
+	CONFIG_BLUEZ_HCIUSB \
+	CONFIG_BT \
+	CONFIG_BT_L2CAP \
+	CONFIG_BT_SCO \
+	CONFIG_BT_RFCOMM \
+	CONFIG_BT_BNEP \
+	CONFIG_BT_HCIUSB \
+	CONFIG_BT_HCIUART
+endef
+
+define KernelPackage/bluetooth/2.4
+#  KCONFIG:= \
+#	CONFIG_BLUEZ \
+#	CONFIG_BLUEZ_L2CAP \
+#	CONFIG_BLUEZ_SCO \
+#	CONFIG_BLUEZ_RFCOMM \
+#	CONFIG_BLUEZ_BNEP \
+#	CONFIG_BLUEZ_HCIUART \
+#	CONFIG_BLUEZ_HCIUSB
   FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -293,14 +274,14 @@ define KernelPackage/bluetooth/2.4
 endef
 
 define KernelPackage/bluetooth/2.6
-  KCONFIG:= \
-	CONFIG_BT \
-	CONFIG_BT_L2CAP \
-	CONFIG_BT_SCO \
-	CONFIG_BT_RFCOMM \
-	CONFIG_BT_BNEP \
-	CONFIG_BT_HCIUSB \
-	CONFIG_BT_HCIUART
+#  KCONFIG:= \
+#	CONFIG_BT \
+#	CONFIG_BT_L2CAP \
+#	CONFIG_BT_SCO \
+#	CONFIG_BT_RFCOMM \
+#	CONFIG_BT_BNEP \
+#	CONFIG_BT_HCIUSB \
+#	CONFIG_BT_HCIUART
   FILES:= \
 	$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
@@ -320,18 +301,23 @@ $(eval $(call KernelPackage,bluetooth))
 
 
 define KernelPackage/mmc
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=MMC/SD Card Support
-  DEPENDS:=@LINUX_2_6_AT91
+  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
 	CONFIG_MMC \
 	CONFIG_MMC_BLOCK \
-	CONFIG_MMC_AT91
+	CONFIG_MMC_DEBUG=n \
+	CONFIG_MMC_UNSAFE_RESUME=n \
+	CONFIG_MMC_BLOCK_BOUNCE=y \
+	CONFIG_MMC_SDHCI=n \
+	CONFIG_MMC_TIFM_SD=n \
+	CONFIG_MMC_WBSD=n \
+	CONFIG_SDIO_UART=n
   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)
+	$(LINUX_DIR)/drivers/mmc/core/mmc_core.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/mmc/card/mmc_block.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block)
 endef
 
 define KernelPackage/mmc/description
@@ -341,19 +327,53 @@ endef
 $(eval $(call KernelPackage,mmc))
 
 
-define KernelPackage/softdog
-  SUBMENU:=$(EMENU)
-  TITLE:=Software watchdog driver
-  KCONFIG:=CONFIG_SOFT_WATCHDOG
-  AUTOLOAD:=$(call AutoLoad,50,softdog)
+define KernelPackage/mmc-at91
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=MMC/SD Card Support on AT91
+  DEPENDS:=@TARGET_at91 +kmod-mmc
+  KCONFIG:=CONFIG_MMC_AT91
+  FILES:=$(LINUX_DIR)/drivers/mmc/host/at91_mci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,at91_mci)
 endef
 
-define KernelPackage/softdog/2.4
-  FILES:=$(LINUX_DIR)/drivers/char/softdog.o
+define KernelPackage/mmc-at91/description
+ Kernel support for MMC/SD cards on the AT91 target
 endef
 
-define KernelPackage/softdog/2.6
-  FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
+$(eval $(call KernelPackage,mmc-at91))
+
+
+# XXX: added a workaround for watchdog path changes
+ifeq ($(KERNEL),2.4)
+  WATCHDOG_DIR=char
+endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
+  WATCHDOG_DIR=watchdog
+endif
+WATCHDOG_DIR?=char/watchdog
+
+define KernelPackage/atmel-wdt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=AT32AP700x watchdog
+  DEPENDS:=@TARGET_avr32
+  KCONFIG:=CONFIG_AT32AP700X_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/at32ap700x_wdt.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,at32ap700x_wdt)
+endef
+
+define KernelPackage/atmel-wdt/description
+ AT32AP700x watchdog
+endef
+
+$(eval $(call KernelPackage,atmel-wdt))
+
+
+define KernelPackage/softdog
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Software watchdog driver
+  KCONFIG:=CONFIG_SOFT_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
 
 define KernelPackage/softdog/description
@@ -363,42 +383,43 @@ endef
 $(eval $(call KernelPackage,softdog))
 
 
-define KernelPackage/videodev
-  SUBMENU:=$(EMENU)
-  TITLE=Video4Linux support
-  KCONFIG:=CONFIG_VIDEO_DEV
+define KernelPackage/leds-gpio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=GPIO LED support
+  DEPENDS:= @GPIO_SUPPORT
+  KCONFIG:=CONFIG_LEDS_GPIO
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,leds-gpio)
 endef
 
-define KernelPackage/videodev/2.4
-  FILES:=$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,videodev)
+define KernelPackage/leds-gpio/description
+ Kernel module for LEDs on GPIO lines
 endef
 
-define KernelPackage/videodev/2.6
-  FILES:= \
-	$(LINUX_DIR)/drivers/media/video/v4l2-common.$(LINUX_KMOD_SUFFIX) \
-	$(if $(CONFIG_VIDEO_V4L1_COMPAT),$(LINUX_DIR)/drivers/media/video/v4l1-compat.$(LINUX_KMOD_SUFFIX)) \
-	$(LINUX_DIR)/drivers/media/video/compat_ioctl32.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60, \
-	v4l2-common \
-	$(if $(CONFIG_VIDEO_V4L1_COMPAT),v4l1-compat) \
-	compat_ioctl32 \
-	videodev \
-  )
+$(eval $(call KernelPackage,leds-gpio))
+
+
+define KernelPackage/ledtrig-adm5120-switch
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED ADM5120 Switch Port Status Trigger
+  DEPENDS:=@TARGET_adm5120
+  KCONFIG:=CONFIG_LEDS_TRIGGER_ADM5120_SWITCH
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-adm5120-switch.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-adm5120-switch)
 endef
 
-define KernelPackage/videodev/description
- Kernel modules for Video4Linux support
+define KernelPackage/ledtrig-adm5120-switch/description
+ Kernel module to allow LEDs to be controlled by the port states
+ of the ADM5120 built-in ethernet switch.
 endef
 
-$(eval $(call KernelPackage,videodev))
+$(eval $(call KernelPackage,ledtrig-adm5120-switch))
 
 
 define KernelPackage/leds-net48xx
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Soekris Net48xx LED support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86 +kmod-scx200-gpio
   KCONFIG:=CONFIG_LEDS_NET48XX
   FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
@@ -411,10 +432,88 @@ endef
 $(eval $(call KernelPackage,leds-net48xx))
 
 
+define KernelPackage/leds-wrap
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PCengines WRAP LED support
+  DEPENDS:=@TARGET_x86 +kmod-scx200-gpio
+  KCONFIG:=CONFIG_LEDS_WRAP
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,leds-wrap)
+endef
+
+define KernelPackage/leds-wrap/description
+ Kernel module for PCengines WRAP LEDs
+endef
+
+$(eval $(call KernelPackage,leds-wrap))
+
+
+define KernelPackage/leds-alix
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PCengines ALIX LED support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_LEDS_ALIX
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-alix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,leds-alix)
+endef
+
+define KernelPackage/leds-alix/description
+ Kernel module for PCengines ALIX LEDs
+endef
+
+$(eval $(call KernelPackage,leds-alix))
+
+
+define KernelPackage/ledtrig-netdev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED NETDEV Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-netdev)
+endef
+
+define KernelPackage/ledtrig-netdev/description
+ Kernel module to drive LEDs based on network activity.
+endef
+
+$(eval $(call KernelPackage,ledtrig-netdev))
+
+
+define KernelPackage/ledtrig-morse
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED Morse Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse)
+endef
+
+define KernelPackage/ledtrig-morse/description
+ Kernel module to show morse coded messages on LEDs.
+endef
+
+$(eval $(call KernelPackage,ledtrig-morse))
+
+
+define KernelPackage/gpio-dev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Generic GPIO char device support
+  DEPENDS:=@GPIO_SUPPORT
+  KCONFIG:=CONFIG_GPIO_DEVICE
+  FILES:=$(LINUX_DIR)/drivers/char/gpio_dev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,gpio_dev)
+endef
+
+define KernelPackage/gpio-dev/description
+  Kernel module to allows control of GPIO pins using a character device.
+endef
+
+$(eval $(call KernelPackage,gpio-dev))
+
+
 define KernelPackage/nsc-gpio
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi GPIO support
-  DEPENDS:=@LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NSC_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
@@ -428,9 +527,9 @@ $(eval $(call KernelPackage,nsc-gpio))
 
 
 define KernelPackage/scx200-gpio
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 GPIO support
-  DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86
+  DEPENDS:=@TARGET_x86 +kmod-nsc-gpio
   KCONFIG:=CONFIG_SCx200_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
@@ -444,11 +543,11 @@ $(eval $(call KernelPackage,scx200-gpio))
 
 
 define KernelPackage/scx200-wdt
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 Watchdog support
-  DEPENDS:=@LINUX_2_6_X86
-  KCONFIG:=CONFIG_SC1200_WDT
-  FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SCx200_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 endef
 
@@ -459,45 +558,24 @@ endef
 $(eval $(call KernelPackage,scx200-wdt))
 
 
-define KernelPackage/hwmon
-  SUBMENU:=$(EMENU)
-  TITLE:=Hardware monitoring support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:= \
-	CONFIG_HWMON \
-	CONFIG_HWMON_VID \
-	CONFIG_HWMON_DEBUG_CHIP=n
-  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)
+define KernelPackage/sc520-wdt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Natsemi SC520 Watchdog support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SC520_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sc520_wdt.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,sc520_wdt)
 endef
 
-define KernelPackage/hwmon/description
- Kernel modules for hardware monitoring
+define KernelPackage/sc520-wdt/description
+  Kernel module for SC520 Watchdog
 endef
 
-$(eval $(call KernelPackage,hwmon))
-
-
-define KernelPackage/hwmon-pc87360
-  SUBMENU:=$(EMENU)
-  TITLE:=PC87360 monitoring support
-  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))
+$(eval $(call KernelPackage,sc520-wdt))
 
 
 define KernelPackage/input-core
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Input device core
   DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_INPUT
@@ -513,7 +591,7 @@ $(eval $(call KernelPackage,input-core))
 
 
 define KernelPackage/input-evdev
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=Input even device
   DEPENDS:=+kmod-input-core
   KCONFIG:=CONFIG_INPUT_EVDEV
@@ -526,3 +604,222 @@ define KernelPackage/input-evdev/description
 endef
 
 $(eval $(call KernelPackage,input-evdev))
+
+
+define KernelPackage/hid
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Input even device
+  DEPENDS:=+kmod-input-core +kmod-input-evdev
+  KCONFIG:=CONFIG_HID
+  FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,hid)
+endef
+
+define KernelPackage/hid/description
+ Kernel modules for HID devices
+endef
+
+$(eval $(call KernelPackage,hid))
+
+
+define KernelPackage/input-polldev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Polled Input device support
+  DEPENDS:=+kmod-input-core @LINUX_2_6
+  KCONFIG:=CONFIG_INPUT_POLLDEV
+  FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,61,input-polldev)
+endef
+
+define KernelPackage/input-polldev/description
+ Kernel module for support of polled input devices
+endef
+
+$(eval $(call KernelPackage,input-polldev))
+
+
+define KernelPackage/input-gpio-buttons
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Polled GPIO buttons input device
+  DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
+  KCONFIG:= \
+	CONFIG_INPUT_GPIO_BUTTONS \
+	CONFIG_INPUT_MISC=y
+  FILES:=$(LINUX_DIR)/drivers/input/misc/gpio_buttons.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,62,gpio_buttons)
+endef
+
+define KernelPackage/input-gpio-buttons/description
+ Kernel module for support polled GPIO buttons input device
+endef
+
+$(eval $(call KernelPackage,input-gpio-buttons))
+
+
+define KernelPackage/mmc-spi
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=MMC/SD over SPI Support
+  DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-crc-itu-t +kmod-crc7
+  KCONFIG:=CONFIG_MMC_SPI \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
+  FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,mmc_spi)
+endef
+
+define KernelPackage/mmc-spi/description
+ Kernel support for MMC/SD over SPI
+endef
+
+$(eval $(call KernelPackage,mmc-spi))
+
+define KernelPackage/mmc-atmelmci
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Amtel MMC Support
+  DEPENDS:=@TARGET_avr32 +kmod-mmc
+  KCONFIG:=CONFIG_MMC_ATMELMCI
+  FILES:=$(LINUX_DIR)/drivers/mmc/host/atmel-mci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,atmel-mci)
+endef
+
+define KernelPackage/mmc-atmelmci/description
+ Kernel support for  Atmel Multimedia Card Interface.
+endef
+
+$(eval $(call KernelPackage,mmc-atmelmci))
+
+define KernelPackage/spi-bitbang
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Serial Peripheral Interface bitbanging library
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_SPI_BITBANG \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
+  FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,91,spi_bitbang)
+endef
+
+define KernelPackage/spi-bitbang/description
+ This package contains the SPI bitbanging library
+endef
+
+$(eval $(call KernelPackage,spi-bitbang))
+
+define KernelPackage/spi-gpio-old
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Old GPIO based bitbanging SPI controller (DEPRECATED)
+  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang
+  KCONFIG:=CONFIG_SPI_GPIO_OLD
+  FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,92,spi_gpio_old)
+endef
+
+define KernelPackage/spi-gpio-old/description
+ This package contains the GPIO based bitbanging SPI controller driver
+endef
+
+$(eval $(call KernelPackage,spi-gpio-old))
+
+define KernelPackage/spi-gpio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=GPIO-based bitbanging SPI Master
+  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang
+  KCONFIG:=CONFIG_SPI_GPIO
+  FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,92,spi_gpio)
+endef
+
+define KernelPackage/spi-gpio/description
+ This package contains the GPIO-based bitbanging SPI Master
+endef
+
+$(eval $(call KernelPackage,spi-gpio))
+
+define KernelPackage/spi-dev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=User mode SPI device driver
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_SPI_SPIDEV \
+          CONFIG_SPI=y \
+          CONFIG_SPI_MASTER=y
+  FILES:=$(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,91,spidev)
+endef
+
+define KernelPackage/spi-dev/description
+ This package contains the user mode SPI device driver
+endef
+
+$(eval $(call KernelPackage,spi-dev))
+
+define KernelPackage/bcm63xx-spi
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Broadcom BCM63xx SPI driver
+  DEPENDS:=@TARGET_brcm63xx +kmod-spi-bitbang
+  KCONFIG:=CONFIG_SPI_BCM63XX
+  FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi)
+endef
+
+define KernelPackage/bcm63xx-spi/description
+  This package contains the Broadcom BCM63xx SPI Master driver
+endef
+
+$(eval $(call KernelPackage,bcm63xx-spi))
+
+define KernelPackage/cs5535-gpio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=AMD CS5535/CS5536 GPIO driver
+  DEPENDS:=@TARGET_x86||@TARGET_olpc
+  KCONFIG:=CONFIG_CS5535_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,cs5535_gpio)
+endef
+
+define KernelPackage/cs5535-gpio/description
+ This package contains the AMD CS5535/CS5536 GPIO driver
+endef
+
+$(eval $(call KernelPackage,cs5535-gpio))
+
+
+define KernelPackage/textsearch
+SUBMENU:=$(OTHER_MENU)
+  TITLE:=Textsearch support is selected if needed
+  DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21
+  KCONFIG:= \
+    CONFIG_TEXTSEARCH=y \
+    CONFIG_TEXTSEARCH_KMP \
+    CONFIG_TEXTSEARCH_BM \
+    CONFIG_TEXTSEARCH_FSM
+  FILES:= \
+    $(LINUX_DIR)/lib/ts_kmp.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/lib/ts_bm.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/lib/ts_fsm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,ts_kmp ts_bm ts_fsm)
+endef
+
+$(eval $(call KernelPackage,textsearch))
+
+
+define KernelPackage/rfkill
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RF switch subsystem support
+  DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!TARGET_rb532 @!TARGET_avr32 @!TARGET_brcm47xx @!TARGET_s3c24xx @!TARGET_ifxmips @!TARGET_atheros @!TARGET_adm5120 @!TARGET_ar7 @!TARGET_ppc40x @!TARGET_ixp4xx @!TARGET_rdc
+  KCONFIG:= \
+    CONFIG_RFKILL \
+    CONFIG_RFKILL_INPUT \
+    CONFIG_RFKILL_LEDS=y
+  FILES:= \
+    $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input)
+endef
+
+define KernelPackage/rfkill/description
+  Say Y here if you want to have control over RF switches
+  found on many WiFi and Bluetooth cards.
+endef
+
+$(eval $(call KernelPackage,rfkill))
+