X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/db46ba48f46e12b2d2ec062bf3d99cf7418a73ee..ce4be8a009eb4f4f0c8800eecead35cae9e15335:/package/kernel/modules/other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index a6897d8eb..8c03efcaf 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -1,18 +1,112 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 OTHER_MENU:=Other modules
 
+WATCHDOG_DIR:=watchdog
+
+
+define KernelPackage/bluetooth
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Bluetooth support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
+  KCONFIG:= \
+	CONFIG_BLUEZ \
+	CONFIG_BLUEZ_L2CAP \
+	CONFIG_BLUEZ_SCO \
+	CONFIG_BLUEZ_RFCOMM \
+	CONFIG_BLUEZ_BNEP \
+	CONFIG_BLUEZ_HCIUART \
+	CONFIG_BLUEZ_HCIUSB \
+	CONFIG_BLUEZ_HIDP \
+	CONFIG_BT \
+	CONFIG_BT_L2CAP \
+	CONFIG_BT_SCO \
+	CONFIG_BT_RFCOMM \
+	CONFIG_BT_BNEP \
+	CONFIG_BT_HCIBTUSB \
+	CONFIG_BT_HCIUSB \
+	CONFIG_BT_HCIUART \
+	CONFIG_BT_HCIUART_H4 \
+	CONFIG_BT_HIDP
+  $(call AddDepends/crc16)
+  $(call AddDepends/hid)
+  $(call AddDepends/rfkill)
+  FILES:= \
+	$(LINUX_DIR)/net/bluetooth/bluetooth.ko \
+	$(LINUX_DIR)/net/bluetooth/l2cap.ko \
+	$(LINUX_DIR)/net/bluetooth/sco.ko \
+	$(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.ko \
+	$(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \
+	$(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \
+	$(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \
+	$(LINUX_DIR)/drivers/bluetooth/btusb.ko
+  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb)
+endef
+
+define KernelPackage/bluetooth/description
+ Kernel support for Bluetooth devices
+endef
+
+$(eval $(call KernelPackage,bluetooth))
+
+
+define KernelPackage/bluetooth-hci-h4p
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=HCI driver with H4 Nokia extensions
+  DEPENDS:=@TARGET_omap24xx +kmod-bluetooth
+  KCONFIG:=CONFIG_BT_HCIH4P
+  FILES:=$(LINUX_DIR)/drivers/bluetooth/hci_h4p/hci_h4p.ko
+  AUTOLOAD:=$(call AutoLoad,91,hci_h4p)
+endef
+
+define KernelPackage/bluetooth-hci-h4p/description
+  HCI driver with H4 Nokia extensions
+endef
+
+$(eval $(call KernelPackage,bluetooth-hci-h4p))
+
+
+define KernelPackage/cpu-msr
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=x86 CPU MSR support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_X86_MSR
+  FILES:=$(LINUX_DIR)/arch/x86/kernel/msr.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,msr)
+endef
+
+define KernelPackage/cpu-msr/description
+ Kernel module for Model Specific Registers support in x86 CPUs
+endef
+
+$(eval $(call KernelPackage,cpu-msr))
+
+
+define KernelPackage/crc-ccitt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CRC-CCITT support
+  KCONFIG:=CONFIG_CRC_CCITT
+  FILES:=$(LINUX_DIR)/lib/crc-ccitt.ko
+  AUTOLOAD:=$(call AutoLoad,20,crc-ccitt)
+endef
+
+define KernelPackage/crc-ccitt/description
+ Kernel module for CRC-CCITT support
+endef
+
+$(eval $(call KernelPackage,crc-ccitt))
+
+
 define KernelPackage/crc-itu-t
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC ITU-T V.41 support
   KCONFIG:=CONFIG_CRC_ITU_T
-  FILES:=$(LINUX_DIR)/lib/crc-itu-t.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/lib/crc-itu-t.ko
   AUTOLOAD:=$(call AutoLoad,20,crc-itu-t)
 endef
 
@@ -23,47 +117,58 @@ endef
 $(eval $(call KernelPackage,crc-itu-t))
 
 
-define KernelPackage/crypto
+define KernelPackage/crc7
   SUBMENU:=$(OTHER_MENU)
-  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))
+  TITLE:=CRC7 support
+  KCONFIG:=CONFIG_CRC7
+  FILES:=$(LINUX_DIR)/lib/crc7.ko
+  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.ko
+  AUTOLOAD:=$(call AutoLoad,20,crc16,1)
+  $(call SetDepends/crc16)
+endef
+
+define KernelPackage/crc16/description
+ Kernel module for CRC16 support
+endef
+
+$(eval $(call KernelPackage,crc16))
+
+
+define KernelPackage/libcrc32c
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CRC32 library support
+  KCONFIG:=CONFIG_LIBCRC32C
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc
+  FILES:=$(LINUX_DIR)/lib/libcrc32c.ko
+  AUTOLOAD:=$(call AutoLoad,20,crc32c libcrc32c,1)
+endef
+
+define KernelPackage/libcrc32c/description
+ Kernel module for CRC32 support
+endef
+
+$(eval $(call KernelPackage,libcrc32c))
 
 
 define KernelPackage/eeprom-93cx6
   SUBMENU:=$(OTHER_MENU)
   TITLE:=EEPROM 93CX6 support
-  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_EEPROM_93CX6
-  FILES:=$(LINUX_DIR)/drivers/misc/eeprom_93cx6.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.ko
   AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6)
 endef
 
@@ -74,309 +179,292 @@ endef
 $(eval $(call KernelPackage,eeprom-93cx6))
 
 
-define KernelPackage/lp
+define KernelPackage/gpio-cs5535
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Parallel port and line printer support
-  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)
-  AUTOLOAD:=$(call AutoLoad,50,parport lp)
+  TITLE:=AMD CS5535/CS5536 GPIO driver
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_CS5535_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio)
 endef
 
-$(eval $(call KernelPackage,lp))
+define KernelPackage/gpio-cs5535/description
+ This package contains the AMD CS5535/CS5536 GPIO driver
+endef
+
+$(eval $(call KernelPackage,gpio-cs5535))
 
 
-define KernelPackage/soundcore
+define KernelPackage/gpio-cs5535-new
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Sound support
-  KCONFIG:= \
-	CONFIG_SOUND \
-	CONFIG_SND \
-	CONFIG_SND_HWDEP \
-	CONFIG_SND_RAWMIDI \
-	CONFIG_SND_TIMER \
-	CONFIG_SND_PCM \
-	CONFIG_HOSTAUDIO
-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)
+  TITLE:=AMD CS5535/CS5536 GPIO driver with improved sysfs support
+  DEPENDS:=@TARGET_x86
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) 
+  KCONFIG:=CONFIG_GPIO_CS5535 CONFIG_PCI CONFIG_GPIOLIB
+  FILES:=$(LINUX_DIR)/drivers/gpio/cs5535-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,cs5535-gpio)
+endif
 endef
 
-define KernelPackage/soundcore/description
- Kernel modules for sound support
+define KernelPackage/gpio-cs5535-new/description
+ This package contains the new AMD CS5535/CS5536 GPIO driver
 endef
 
-$(eval $(call KernelPackage,soundcore))
+$(eval $(call KernelPackage,gpio-cs5535-new))
 
 
-define KernelPackage/capi
+define KernelPackage/gpio-dev
   SUBMENU:=$(OTHER_MENU)
-  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)
+  TITLE:=Generic GPIO char device support
+  DEPENDS:=@GPIO_SUPPORT
+  KCONFIG:=CONFIG_GPIO_DEVICE
+  FILES:=$(LINUX_DIR)/drivers/char/gpio_dev.ko
+  AUTOLOAD:=$(call AutoLoad,40,gpio_dev)
 endef
 
-define KernelPackage/capi/description
- Kernel module for basic CAPI support
+define KernelPackage/gpio-dev/description
+  Kernel module to allows control of GPIO pins using a character device.
 endef
 
-$(eval $(call KernelPackage,capi))
+$(eval $(call KernelPackage,gpio-dev))
 
 
-define KernelPackage/pcmcia-core
+define KernelPackage/gpio-nsc
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=PCMCIA/CardBus support
-  DEPENDS:=@PCMCIA_SUPPORT
-  KCONFIG:= \
-	CONFIG_PCMCIA \
-	CONFIG_CARDBUS
-	CONFIG_PCCARD \
-	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/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 \
-#	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/yenta_socket.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
+  TITLE:=Natsemi GPIO support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_NSC_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
 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)
+define KernelPackage/gpio-nsc/description
+ Kernel module for Natsemi GPIO
+endef
+
+$(eval $(call KernelPackage,gpio-nsc))
+
+
+define KernelPackage/gpio-pc8736x
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PC8736x GPIO support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_PC8736x_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/pc8736x_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,40,pc8736x_gpio)
 endef
 
-define KernelPackage/pcmcia-core/description
- Kernel support for PCMCIA/CardBus controllers
+define KernelPackage/gpio-pc8736x/description
+ Kernel module for PC8736x GPIO
 endef
 
-$(eval $(call KernelPackage,pcmcia-core))
+$(eval $(call KernelPackage,gpio-pc8736x))
 
 
-define KernelPackage/pcmcia-serial
+define KernelPackage/gpio-scx200
   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)
+  TITLE:=Natsemi SCX200 GPIO support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-nsc
+  KCONFIG:=CONFIG_SCx200_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
 endef
 
-define KernelPackage/pcmcia-serial/2.4
-#  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
-  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
+define KernelPackage/gpio-scx200/description
+ Kernel module for SCX200 GPIO
 endef
 
-define KernelPackage/pcmcia-serial/2.6
-#  KCONFIG:=CONFIG_SERIAL_8250_CS
-  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
+$(eval $(call KernelPackage,gpio-scx200))
+
+define KernelPackage/gpio-nxp-74hc164
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=NXP 74HC164 GPIO expander support
+  DEPENDS:=@TARGET_brcm63xx
+  KCONFIG:=CONFIG_GPIO_NXP_74HC164
+  FILES:=$(LINUX_DIR)/drivers/gpio/nxp_74hc164.ko
+  AUTOLOAD:=$(call AutoLoad,99,nxp_74hc164)
 endef
 
-define KernelPackage/pcmcia-serial/description
- Kernel support for PCMCIA/CardBus serial devices
+define KernelPackage/gpio-nxp-74hc164/description
+  Kernel module for NXP 74HC164 GPIO expander
 endef
 
-$(eval $(call KernelPackage,pcmcia-serial))
+$(eval $(call KernelPackage,gpio-nxp-74hc164))
 
+define KernelPackage/hid
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=HID Devices
+  DEPENDS:=+kmod-input-evdev
+  KCONFIG:=CONFIG_HID
+  FILES:=$(LINUX_DIR)/drivers/hid/hid.ko
+  AUTOLOAD:=$(call AutoLoad,61,hid)
+  $(call SetDepends/hid)
+  $(call AddDepends/input)
+endef
 
-define KernelPackage/bluetooth
+define KernelPackage/hid/description
+ Kernel modules for HID devices
+endef
+
+$(eval $(call KernelPackage,hid))
+
+
+define KernelPackage/input-core
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT
+  TITLE:=Input device core
+  KCONFIG:=CONFIG_INPUT
+  $(call SetDepends/input)
+  FILES:=$(LINUX_DIR)/drivers/input/input-core.ko
+  AUTOLOAD:=$(call AutoLoad,19,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:=$(OTHER_MENU)
+  TITLE:=Input event device
+  KCONFIG:=CONFIG_INPUT_EVDEV
+  FILES:=$(LINUX_DIR)/drivers/input/evdev.ko
+  AUTOLOAD:=$(call AutoLoad,60,evdev)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-evdev/description
+ Kernel modules for support of input device events
+endef
+
+$(eval $(call KernelPackage,input-evdev))
+
+
+define KernelPackage/input-gpio-buttons
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Polled GPIO buttons input device
+  DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
   KCONFIG:= \
-	CONFIG_BLUEZ \
-	CONFIG_BLUEZ_L2CAP \
-	CONFIG_BLUEZ_SCO \
-	CONFIG_BLUEZ_RFCOMM \
-	CONFIG_BLUEZ_BNEP \
-	CONFIG_BLUEZ_HCIUART \
-	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) \
-	$(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,bluez l2cap sco rfcomm bnep hci_uart hci_usb)
-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
-  FILES:= \
-	$(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb)
+	CONFIG_INPUT_GPIO_BUTTONS \
+	CONFIG_INPUT_MISC=y
+  FILES:=$(LINUX_DIR)/drivers/input/misc/gpio_buttons.ko
+  AUTOLOAD:=$(call AutoLoad,62,gpio_buttons)
 endef
 
-define KernelPackage/bluetooth/description
- Kernel support for Bluetooth devices
+define KernelPackage/input-gpio-buttons/description
+ Kernel module for support polled GPIO buttons input device
 endef
 
-$(eval $(call KernelPackage,bluetooth))
+$(eval $(call KernelPackage,input-gpio-buttons))
 
 
-define KernelPackage/mmc
+define KernelPackage/input-gpio-keys
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=MMC/SD Card Support
-  DEPENDS:=@TARGET_at91
+  TITLE:=GPIO key support
+  DEPENDS:= @GPIO_SUPPORT
   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)
+	CONFIG_KEYBOARD_GPIO \
+	CONFIG_INPUT_KEYBOARD=y
+  FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko
+  AUTOLOAD:=$(call AutoLoad,60,gpio_keys)
+  $(call AddDepends/input)
 endef
 
-define KernelPackage/mmc/description
- Kernel support for MMC/SD cards
+define KernelPackage/input-gpio-keys/description
+ This driver implements support for buttons connected
+ to GPIO pins of various CPUs (and some other chips).
 endef
 
-$(eval $(call KernelPackage,mmc))
+$(eval $(call KernelPackage,input-gpio-keys))
 
 
-define KernelPackage/softdog
+define KernelPackage/input-gpio-encoder
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Software watchdog driver
-  KCONFIG:=CONFIG_SOFT_WATCHDOG
-  AUTOLOAD:=$(call AutoLoad,50,softdog)
+  TITLE:=GPIO rotay encoder
+  KCONFIG:=CONFIG_INPUT_GPIO_ROTARY_ENCODER
+  FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.ko
+  AUTOLOAD:=$(call AutoLoad,62,rotary_encoder)
+  $(call AddDepends/input,@GPIO_SUPPORT)
 endef
 
-define KernelPackage/softdog/2.4
-  FILES:=$(LINUX_DIR)/drivers/char/softdog.o
+define KernelPackage/gpio-encoder/description
+ Kernel module to use rotary encoders connected to GPIO pins
 endef
 
-define KernelPackage/softdog/2.6
-  FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
+$(eval $(call KernelPackage,input-gpio-encoder))
+
+
+define KernelPackage/input-joydev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Joystick device support
+  KCONFIG:=CONFIG_INPUT_JOYDEV
+  FILES:=$(LINUX_DIR)/drivers/input/joydev.ko
+  AUTOLOAD:=$(call AutoLoad,62,joydev)
+  $(call AddDepends/input)
 endef
 
-define KernelPackage/softdog/description
- Software watchdog driver
+define KernelPackage/input-joydev/description
+  Kernel module for joystick support
 endef
 
-$(eval $(call KernelPackage,softdog))
+$(eval $(call KernelPackage,input-joydev))
+
+
+define KernelPackage/input-polldev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Polled Input device support
+  KCONFIG:=CONFIG_INPUT_POLLDEV
+  FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko
+  AUTOLOAD:=$(call AutoLoad,20,input-polldev)
+  $(call AddDepends/input)
+endef
+
+define KernelPackage/input-polldev/description
+ Kernel module for support of polled input devices
+endef
+
+$(eval $(call KernelPackage,input-polldev))
+
+
+define KernelPackage/leds-alix
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=PCengines ALIX LED support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_LEDS_ALIX2
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-alix2.ko
+  AUTOLOAD:=$(call AutoLoad,50,leds-alix2)
+endef
+
+define KernelPackage/leds-alix/description
+ Kernel module for PCengines ALIX LEDs
+endef
+
+$(eval $(call KernelPackage,leds-alix))
+
+
+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.ko
+  AUTOLOAD:=$(call AutoLoad,60,leds-gpio)
+endef
+
+define KernelPackage/leds-gpio/description
+ Kernel module for LEDs on GPIO lines
+endef
+
+$(eval $(call KernelPackage,leds-gpio))
 
 
 define KernelPackage/leds-net48xx
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Soekris Net48xx LED support
-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86 +kmod-gpio-scx200
   KCONFIG:=CONFIG_LEDS_NET48XX
-  FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.ko
   AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
 endef
 
@@ -386,13 +474,60 @@ endef
 
 $(eval $(call KernelPackage,leds-net48xx))
 
+define KernelPackage/leds-net5501
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Soekris Net5501 LED support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-cs5535 +kmod-leds-gpio
+  KCONFIG:=CONFIG_LEDS_NET5501
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-net5501.ko
+  AUTOLOAD:=$(call AutoLoad,50,leds-net5501)
+endef
+
+define KernelPackage/leds-net5501/description
+ Kernel module for Soekris Net5501 LEDs
+endef
+
+$(eval $(call KernelPackage,leds-net5501))
+
+
+define KernelPackage/leds-rb750
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RouterBOARD 750 LED support
+  DEPENDS:=@TARGET_ar71xx
+  KCONFIG:=CONFIG_LEDS_RB750
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-rb750.ko
+  AUTOLOAD:=$(call AutoLoad,60,leds-rb750)
+endef
+
+define KernelPackage/leds-rb750/description
+ Kernel module for the LEDs on the MikroTik RouterBOARD 750.
+endef
+
+$(eval $(call KernelPackage,leds-rb750))
+
+
+define KernelPackage/leds-wndr3700-usb
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=WNDR3700 USB LED support
+  DEPENDS:=@TARGET_ar71xx
+  KCONFIG:=CONFIG_LEDS_WNDR3700_USB
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wndr3700-usb.ko
+  AUTOLOAD:=$(call AutoLoad,60,leds-wndr3700-usb)
+endef
+
+define KernelPackage/leds-wndr3700-usb/description
+ Kernel module for the USB LED on the NETGWR WNDR3700 board.
+endef
+
+$(eval $(call KernelPackage,leds-wndr3700-usb))
+
 
 define KernelPackage/leds-wrap
-  SUBMENU:=$(EMENU)
+  SUBMENU:=$(OTHER_MENU)
   TITLE:=PCengines WRAP LED support
-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86 +kmod-gpio-scx200
   KCONFIG:=CONFIG_LEDS_WRAP
-  FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.ko
   AUTOLOAD:=$(call AutoLoad,50,leds-wrap)
 endef
 
@@ -403,118 +538,416 @@ endef
 $(eval $(call KernelPackage,leds-wrap))
 
 
-define KernelPackage/nsc-gpio
+define KernelPackage/ledtrig-heartbeat
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Natsemi GPIO support
+  TITLE:=LED Heartbeat Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-heartbeat.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat)
+endef
+
+define KernelPackage/ledtrig-gpio/description
+ Kernel module that allows LEDs to blink like heart beat
+endef
+
+$(eval $(call KernelPackage,ledtrig-heartbeat))
+
+
+define KernelPackage/ledtrig-gpio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED GPIO Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio)
+endef
+
+define KernelPackage/ledtrig-gpio/description
+ Kernel module that allows LEDs to be controlled by gpio events.
+endef
+
+$(eval $(call KernelPackage,ledtrig-gpio))
+
+
+define KernelPackage/ledtrig-morse
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED Morse Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.ko
+  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/ledtrig-netdev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED NETDEV Trigger
+  KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.ko
+  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-netfilter
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED NetFilter Trigger
+  DEPENDS:=kmod-ipt-core
+  KCONFIG:=CONFIG_NETFILTER_XT_TARGET_LED
+  FILES:=$(LINUX_DIR)/net/netfilter/xt_LED.ko
+  AUTOLOAD:=$(call AutoLoad,50,xt_LED)
+endef
+
+define KernelPackage/ledtrig-netfilter/description
+ Kernel module to flash LED when a particular packets passing through your machine.
+
+ For example to create an LED trigger for incoming SSH traffic:
+    iptables -A INPUT -p tcp --dport 22 -j LED --led-trigger-id ssh --led-delay 1000
+ Then attach the new trigger to an LED on your system:
+    echo netfilter-ssh > /sys/class/leds/<ledname>/trigger
+endef
+
+$(eval $(call KernelPackage,ledtrig-netfilter))
+
+define KernelPackage/ledtrig-usbdev
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=LED USB device Trigger
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
+  KCONFIG:=CONFIG_LEDS_TRIGGER_USBDEV
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-usbdev.ko
+  AUTOLOAD:=$(call AutoLoad,50,ledtrig-usbdev)
+endef
+
+define KernelPackage/ledtrig-usbdev/description
+ Kernel module to drive LEDs based on USB device presence/activity.
+endef
+
+$(eval $(call KernelPackage,ledtrig-usbdev))
+
+
+define KernelPackage/lp
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Parallel port and line printer support
+  DEPENDS:=@BROKEN
+  KCONFIG:= \
+	CONFIG_PARPORT \
+	CONFIG_PRINTER \
+	CONFIG_PPDEV
+  FILES:= \
+	$(LINUX_DIR)/drivers/parport/parport.ko \
+	$(LINUX_DIR)/drivers/char/lp.ko \
+	$(LINUX_DIR)/drivers/char/ppdev.ko
+  AUTOLOAD:=$(call AutoLoad,50,parport lp)
+endef
+
+$(eval $(call KernelPackage,lp))
+
+
+define KernelPackage/mmc
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=MMC/SD Card Support
+  KCONFIG:= \
+	CONFIG_MMC \
+	CONFIG_MMC_BLOCK \
+	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/core/mmc_core.ko \
+	$(LINUX_DIR)/drivers/mmc/card/mmc_block.ko
+  AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block,1)
+endef
+
+define KernelPackage/mmc/description
+ Kernel support for MMC/SD cards
+endef
+
+$(eval $(call KernelPackage,mmc))
+
+
+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.ko
+  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,1))
+
+
+define KernelPackage/oprofile
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=OProfile profiling support
+  KCONFIG:=CONFIG_OPROFILE
+  FILES:=$(LINUX_DIR)/arch/$(LINUX_KARCH)/oprofile/oprofile.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@KERNEL_PROFILING
+endef
+
+define KernelPackage/oprofile/description
+  Kernel module for support for oprofile system profiling.
+endef
+
+$(eval $(call KernelPackage,oprofile))
+
+
+define KernelPackage/rfkill
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RF switch subsystem support
+  KCONFIG:= \
+    CONFIG_RFKILL \
+    CONFIG_RFKILL_INPUT=y \
+    CONFIG_RFKILL_LEDS=y
+ifeq ($(CONFIG_LINUX_2_6_30),)
+  FILES:= \
+    $(LINUX_DIR)/net/rfkill/rfkill.ko
+  AUTOLOAD:=$(call AutoLoad,20,rfkill)
+else
+  FILES:= \
+    $(LINUX_DIR)/net/rfkill/rfkill.ko \
+    $(LINUX_DIR)/net/rfkill/rfkill-input.ko
+  AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input)
+endif
+  $(call SetDepends/rfkill)
+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))
+
+
+define KernelPackage/softdog
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Software watchdog driver
+  KCONFIG:=CONFIG_SOFT_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.ko
+  AUTOLOAD:=$(call AutoLoad,50,softdog)
+endef
+
+define KernelPackage/softdog/description
+ Software watchdog driver
+endef
+
+$(eval $(call KernelPackage,softdog))
+
+
+define KernelPackage/ssb
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Silicon Sonics Backplane glue code
+  DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_brcm63xx
+  KCONFIG:=\
+	CONFIG_SSB \
+	CONFIG_SSB_B43_PCI_BRIDGE=y \
+	CONFIG_SSB_DRIVER_MIPS=n \
+	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.ko
+  AUTOLOAD:=$(call AutoLoad,29,ssb)
+endef
+
+define KernelPackage/ssb/description
+  Silicon Sonics Backplane glue code.
+endef
+
+$(eval $(call KernelPackage,ssb))
+
+
+define KernelPackage/textsearch
+SUBMENU:=$(OTHER_MENU)
+  TITLE:=Textsearch support is selected if needed
+  KCONFIG:= \
+    CONFIG_TEXTSEARCH=y \
+    CONFIG_TEXTSEARCH_KMP \
+    CONFIG_TEXTSEARCH_BM \
+    CONFIG_TEXTSEARCH_FSM
+  FILES:= \
+    $(LINUX_DIR)/lib/ts_kmp.ko \
+    $(LINUX_DIR)/lib/ts_bm.ko \
+    $(LINUX_DIR)/lib/ts_fsm.ko
+  AUTOLOAD:=$(call AutoLoad,20,ts_kmp ts_bm ts_fsm)
+endef
+
+$(eval $(call KernelPackage,textsearch))
+
+
+define KernelPackage/wdt-geode
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Geode/LX Watchdog timer
   DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_NSC_GPIO
-  FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
+  KCONFIG:=CONFIG_GEODE_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,geodewdt)
 endef
 
-define KernelPackage/nsc-gpio/description
- Kernel module for Natsemi GPIO
+define KernelPackage/wdt-geode/description
+  Kernel module for Geode watchdog timer.
 endef
 
-$(eval $(call KernelPackage,nsc-gpio))
+$(eval $(call KernelPackage,wdt-geode))
 
 
-define KernelPackage/scx200-gpio
+define KernelPackage/wdt-omap
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Natsemi SCX200 GPIO support
-  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)
+  TITLE:=OMAP Watchdog timer
+  DEPENDS:=@(TARGET_omap24xx||TARGET_omap35xx)
+  KCONFIG:=CONFIG_OMAP_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/omap_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,omap_wdt.ko)
 endef
 
-define KernelPackage/scx200-gpio/description
- Kernel module for SCX200 GPIO
+define KernelPackage/wdt-omap/description
+  Kernel module for TI omap watchdog timer.
+endef
+
+$(eval $(call KernelPackage,wdt-omap))
+
+
+define KernelPackage/wdt-orion
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Marvell Orion Watchdog timer
+  DEPENDS:=@TARGET_orion
+  KCONFIG:=CONFIG_ORION_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/orion_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,orion_wdt)
+endef
+
+define KernelPackage/wdt-orion/description
+  Kernel module for Marvell orion watchdog timer.
+endef
+
+$(eval $(call KernelPackage,wdt-orion))
+
+
+define KernelPackage/wdt-sc520
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Natsemi SC520 Watchdog support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SC520_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sc520_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,sc520_wdt)
+endef
+
+define KernelPackage/wdt-sc520/description
+  Kernel module for SC520 Watchdog
 endef
 
-$(eval $(call KernelPackage,scx200-gpio))
+$(eval $(call KernelPackage,wdt-sc520))
 
 
-define KernelPackage/scx200-wdt
+define KernelPackage/wdt-scx200
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 Watchdog support
   DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_SC1200_WDT
-  FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_SCx200_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.ko
   AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 endef
 
-define KernelPackage/scx200-wdt/description
+define KernelPackage/wdt-scx200/description
  Kernel module for SCX200 Watchdog
 endef
 
-$(eval $(call KernelPackage,scx200-wdt))
-
+$(eval $(call KernelPackage,wdt-scx200))
 
-define KernelPackage/hwmon
+define KernelPackage/pwm
   SUBMENU:=$(OTHER_MENU)
-  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)
+  TITLE:=PWM generic API
+  KCONFIG:=CONFIG_GENERIC_PWM
+  FILES:=$(LINUX_DIR)/drivers/pwm/pwm.ko
+  AUTOLOAD:=$(call AutoLoad,50,pwm)
 endef
 
-define KernelPackage/hwmon/description
- Kernel modules for hardware monitoring
+define KernelPackage/pwm/description
+ Kernel module that implement a generic PWM API
 endef
 
-$(eval $(call KernelPackage,hwmon))
+$(eval $(call KernelPackage,pwm))
 
 
-define KernelPackage/hwmon-pc87360
+define KernelPackage/pwm-gpio
   SUBMENU:=$(OTHER_MENU)
-  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)
+  TITLE:=PWM over GPIO
+  DEPENDS:=+kmod-pwm
+  KCONFIG:=CONFIG_GPIO_PWM
+  FILES:=$(LINUX_DIR)/drivers/pwm/gpio-pwm.ko
+  AUTOLOAD:=$(call AutoLoad,51,gpio-pwm)
 endef
 
-define KernelPackage/hwmon-pc87360/description
- Kernel modules for PC87360 chips
+define KernelPackage/pwm-gpio/description
+ Kernel module to models a single-channel PWM device using a timer and a GPIO pin
 endef
 
-$(eval $(call KernelPackage,hwmon-pc87360))
+$(eval $(call KernelPackage,pwm-gpio))
+
+define KernelPackage/rtc-core
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Real Time Clock class support
+  KCONFIG:=CONFIG_RTC_CLASS
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-core.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,29,rtc-core)
+endef
 
+define KernelPackage/rtc-core/description
+ Generic RTC class support.
+endef
 
-define KernelPackage/input-core
+$(eval $(call KernelPackage,rtc-core))
+
+define KernelPackage/rtc-pcf8563
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Input device core
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=CONFIG_INPUT
-  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,input-core)
+  TITLE:=Philips PCF8563/Epson RTC8564 RTC support
+  DEPENDS:=+kmod-rtc-core
+  KCONFIG:=CONFIG_RTC_DRV_PCF8563
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf8563.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,rtc-pcf8563)
 endef
 
-define KernelPackage/input-core/description
- Kernel modules for support of input device
+define KernelPackage/rtc-pcf8563/description
+ Kernel module for Philips PCF8563 RTC chip.
+ The Epson RTC8564 should work as well.
 endef
 
-$(eval $(call KernelPackage,input-core))
+$(eval $(call KernelPackage,rtc-pcf8563))
 
 
-define KernelPackage/input-evdev
+define KernelPackage/n810bm
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Input even device
-  DEPENDS:=+kmod-input-core
-  KCONFIG:=CONFIG_INPUT_EVDEV
-  FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,evdev)
+  TITLE:=Nokia N810 battery management driver
+  DEPENDS:=@TARGET_omap24xx
+  KCONFIG:=CONFIG_N810BM
+  FILES:=$(LINUX_DIR)/drivers/cbus/n810bm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,01,n810bm)
 endef
 
-define KernelPackage/input-evdev/description
- Kernel modules for support of input device events
+define KernelPackage/n810bm/description
+  Nokia N810 battery management driver.
+  Controls battery power management and battery charging.
 endef
 
-$(eval $(call KernelPackage,input-evdev))
+$(eval $(call KernelPackage,n810bm))