X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=67e051aa28e75f7f83e83c83fbb4cc744a02caff;hb=8dc7ced4d4df85bc6cc77b625d54150a64f31bc6;hp=a30046daf5d4572eee228dee9485acd804537896;hpb=d54c1ecd5f03636da8218838df2c4ddb088679e9;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index a30046daf5..67e051aa28 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -8,102 +8,89 @@
 
 EMENU:=Other modules
 
+define KernelPackage/crc-itu-t
+  SUBMENU:=$(EMENU)
+  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
+
+$(eval $(call KernelPackage,crc-itu-t))
+
+
 define KernelPackage/crypto
+  SUBMENU:=$(EMENU)
   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
+define KernelPackage/eeprom-93cx6
   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)
+  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
-$(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))
+$(eval $(call KernelPackage,eeprom-93cx6))
 
-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
+  SUBMENU:=$(EMENU)
   TITLE:=Parallel port and line printer support
-  KCONFIG:=$(CONFIG_PARPORT)
+  DEPENDS:=@LINUX_2_4
+  KCONFIG:= \
+	CONFIG_PARPORT \
+	CONFIG_PRINTER \
+	CONFIG_PPDEV
   FILES:= \
 	$(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)
+  KCONFIG:=CONFIG_SOUND
 endef
 
 define KernelPackage/soundcore/2.4
@@ -112,99 +99,172 @@ define KernelPackage/soundcore/2.4
 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/*.$(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)
+	$(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
+
 $(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)
+  KCONFIG:=CONFIG_BLK_DEV_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)
+  KCONFIG:=CONFIG_BLK_DEV_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)
-  SUBMENU:=$(EMENU)
+  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)
-  FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX)
 endef
+
 $(eval $(call KernelPackage,capi))
 
+
 define KernelPackage/pcmcia-core
+  SUBMENU:=$(EMENU)
   TITLE:=PCMCIA/CardBus support
   DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
-  SUBMENU:=$(EMENU)
+  DEPENDS:=@PCMCIA_SUPPORT
 endef
 
 define KernelPackage/pcmcia-core/2.4
-  KCONFIG:=$(CONFIG_PCMCIA)
+  KCONFIG:= \
+	CONFIG_PCMCIA \
+	CONFIG_CARDBUS
   FILES:= \
 	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/ds.$(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_PCCARD)
+  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/yenta_socket.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(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)
 endef
+
+define KernelPackage/pcmcia-core/au1000-2.6
+  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)
+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)
 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
+
 $(eval $(call KernelPackage,pcmcia-serial))
 
 
 define KernelPackage/bluetooth
+  SUBMENU:=$(EMENU)
   TITLE:=Bluetooth support
   DEPENDS:=@USB_SUPPORT
   DESCRIPTION:=Kernel support for Bluetooth devices
-  SUBMENU:=$(EMENU)
- endef
+endef
 
- define KernelPackage/bluetooth/2.4
-  KCONFIG:=$(CONFIG_BLUEZ)
+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) \
@@ -217,7 +277,14 @@ define KernelPackage/bluetooth
 endef
 
 define KernelPackage/bluetooth/2.6
-  KCONFIG:=$(CONFIG_BT)
+  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) \
@@ -228,31 +295,34 @@ 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)
- endef
-
-define KernelPackage/mmc/2.6
-	KCONFIG:=$(CONFIG_MMC)
-	FILES:= \
+  KCONFIG:= \
+	CONFIG_MMC \
+	CONFIG_MMC_BLOCK \
+	CONFIG_MMC_AT91
+  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))
 
+
 define KernelPackage/softdog
+  SUBMENU:=$(EMENU)
   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
 
@@ -268,92 +338,138 @@ $(eval $(call KernelPackage,softdog))
 
 
 define KernelPackage/videodev
+  SUBMENU:=$(EMENU)
   TITLE=Video4Linux support
   DESCRIPTION:=Kernel modules for Video4Linux support
-  DEPENDS:=@VIDEO_SUPPORT
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_VIDEO_DEV)
-  FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_VIDEO_DEV
 endef
 
 define KernelPackage/videodev/2.4
+  FILES:=$(LINUX_DIR)/drivers/media/video/videodev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,videodev)
 endef
 
 define KernelPackage/videodev/2.6
-  AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat videodev)
+  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 \
+  )
 endef
+
 $(eval $(call KernelPackage,videodev))
 
+
 define KernelPackage/leds-net48xx
+  SUBMENU:=$(EMENU)
   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
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_LEDS_NET48XX)
+  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
+
 $(eval $(call KernelPackage,leds-net48xx))
 
+
 define KernelPackage/nsc-gpio
+  SUBMENU:=$(EMENU)
   TITLE:=Natsemi GPIO support
   DESCRIPTION:=Kernel module for Natsemi GPIO
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
-  DEPENDS:=@LINUX_2_6_X86_Soekris
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_NSC_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
+
 $(eval $(call KernelPackage,nsc-gpio))
 
+
 define KernelPackage/scx200-gpio
+  SUBMENU:=$(EMENU)
   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
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_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
+
 $(eval $(call KernelPackage,scx200-gpio))
 
+
 define KernelPackage/scx200-wdt
+  SUBMENU:=$(EMENU)
   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
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_SC1200_WDT)
+  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_wt)
+  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
-  DEFAULT:=y if LINUX_2_6_X86_Soekris
-  SUBMENU:=$(EMENU)
-  KCONFIG:=$(CONFIG_HWMON_VID)
+  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)
 endef
+
 $(eval $(call KernelPackage,hwmon))
 
+
 define KernelPackage/hwmon-pc87360
+  SUBMENU:=$(EMENU)
   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
+
 $(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
+
+$(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
+
+$(eval $(call KernelPackage,input-evdev))