X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=22d330a60a4be92709796194874c3eba22351e72;hp=a000656bf150d251ecc5b06562ac8befca44d257;hb=d12594e33657a618f8b524c0efb95fdfcc46bfaa;hpb=2f20a5aecd2ac23c0e5463624a1e836ff6f66249

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index a000656bf1..22d330a60a 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 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.
@@ -7,33 +7,75 @@
 
 OTHER_MENU:=Other modules
 
-define KernelPackage/block2mtd
+WATCHDOG_DIR:=watchdog
+
+
+define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Block device MTD emulation
-  KCONFIG:=CONFIG_MTD_BLOCK2MTD
-  FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX)
+  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
-$(eval $(call KernelPackage,block2mtd))
 
-define KernelPackage/crc-itu-t
+define KernelPackage/bluetooth/description
+ Kernel support for Bluetooth devices
+endef
+
+$(eval $(call KernelPackage,bluetooth))
+
+
+define KernelPackage/cpu-msr
   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)
-  AUTOLOAD:=$(call AutoLoad,20,crc-itu-t)
+  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/crc-itu-t/description
- Kernel module for CRC ITU-T V.41 support
+define KernelPackage/cpu-msr/description
+ Kernel module for Model Specific Registers support in x86 CPUs
 endef
 
-$(eval $(call KernelPackage,crc-itu-t))
+$(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.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/lib/crc-ccitt.ko
   AUTOLOAD:=$(call AutoLoad,20,crc-ccitt)
 endef
 
@@ -44,11 +86,26 @@ 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.ko
+  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/crc7
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC7 support
   KCONFIG:=CONFIG_CRC7
-  FILES:=$(LINUX_DIR)/lib/crc7.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/lib/crc7.ko
   AUTOLOAD:=$(call AutoLoad,20,crc7)
 endef
 
@@ -63,8 +120,9 @@ define KernelPackage/crc16
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC16 support
   KCONFIG:=CONFIG_CRC16
-  FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/lib/crc16.ko
   AUTOLOAD:=$(call AutoLoad,20,crc16,1)
+  $(call SetDepends/crc16)
 endef
 
 define KernelPackage/crc16/description
@@ -74,12 +132,27 @@ 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/eeprom_93cx6.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.ko
   AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6)
 endef
 
@@ -90,339 +163,254 @@ 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 \
+	   CONFIG_GPIO_CS5535
+ifeq ($(CONFIG_LINUX_2_6_32),y)
+  FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio)
+else
+  FILES:=$(LINUX_DIR)/drivers/gpio/cs5535-gpio.ko
+  AUTOLOAD:=$(call AutoLoad,50,cs5535-gpio)
+endif
 endef
 
-$(eval $(call KernelPackage,lp))
-
-define KernelPackage/pcspkr
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=PC speaker support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=CONFIG_INPUT_PCSPKR
-  FILES:= \
-	$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50, \
-  	pcspkr \
-  )
+define KernelPackage/gpio-cs5535/description
+ This package contains the AMD CS5535/CS5536 GPIO driver
 endef
 
-define KernelPackage/pcspkr/description
- This enables sounds (tones) through the pc speaker
-endef
+$(eval $(call KernelPackage,gpio-cs5535))
 
-$(eval $(call KernelPackage,pcspkr))
 
-define KernelPackage/pcmcia-core
+define KernelPackage/gpio-dev
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=PCMCIA/CardBus support
-  DEPENDS:=@PCMCIA_SUPPORT
-  KCONFIG:= \
-	CONFIG_PCMCIA \
-	CONFIG_CARDBUS \
-	CONFIG_PCCARD \
-	PCMCIA_DEBUG=n
+  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/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,25,pcmcia_core ds yenta_socket)
+define KernelPackage/gpio-dev/description
+  Kernel module to allows control of GPIO pins using a character device.
 endef
 
-define KernelPackage/pcmcia-core/2.6
-#  KCONFIG:= \
-#	CONFIG_PCCARD \
-#	CONFIG_PCMCIA \
-#	PCMCIA_DEBUG=n
-  FILES:= \
-	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia)
+$(eval $(call KernelPackage,gpio-dev))
+
+
+define KernelPackage/gpio-nsc
+  SUBMENU:=$(OTHER_MENU)
+  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/description
- Kernel support for PCMCIA/CardBus controllers
+define KernelPackage/gpio-nsc/description
+ Kernel module for Natsemi GPIO
 endef
 
-$(eval $(call KernelPackage,pcmcia-core))
+$(eval $(call KernelPackage,gpio-nsc))
 
 
-define KernelPackage/pcmcia-yenta
+define KernelPackage/gpio-pc8736x
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=yenta socket driver
-  DEPENDS:=@LINUX_2_6 kmod-pcmcia-core
-  KCONFIG:= \
-	CONFIG_PCCARD_NONSTATIC \
-	CONFIG_YENTA
-  FILES:= \
-	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket)
+  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/gpio-pc8736x/description
+ Kernel module for PC8736x GPIO
 endef
 
-$(eval $(call KernelPackage,pcmcia-yenta))
+$(eval $(call KernelPackage,gpio-pc8736x))
 
 
-define KernelPackage/pcmcia-au1000
+define KernelPackage/gpio-scx200
   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)
+  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/gpio-scx200/description
+ Kernel module for SCX200 GPIO
 endef
 
-$(eval $(call KernelPackage,pcmcia-au1000))
+$(eval $(call KernelPackage,gpio-scx200))
 
-define KernelPackage/pcmcia-bcm63xx
+define KernelPackage/gpio-nxp-74hc164
   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)
+  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-bcm63xx/description
-  Kernel support for PCMCIA/CardBus controller on the BCM63xx SoC
+define KernelPackage/gpio-nxp-74hc164/description
+  Kernel module for NXP 74HC164 GPIO expander
 endef
 
-$(eval $(call KernelPackage,pcmcia-bcm63xx))
+$(eval $(call KernelPackage,gpio-nxp-74hc164))
 
-define KernelPackage/pcmcia-serial
+define KernelPackage/hid
   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:=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/pcmcia-serial/2.4
-#  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
-  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
+define KernelPackage/hid/description
+ Kernel modules for HID devices
 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,hid))
+
+
+define KernelPackage/input-core
+  SUBMENU:=$(OTHER_MENU)
+  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/pcmcia-serial/description
- Kernel support for PCMCIA/CardBus serial devices
+define KernelPackage/input-core/description
+ Kernel modules for support of input device
 endef
 
-$(eval $(call KernelPackage,pcmcia-serial))
+$(eval $(call KernelPackage,input-core))
+
 
-define KernelPackage/ssb
+define KernelPackage/input-evdev
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Silicon Sonics Backplane glue code
-  DEPENDS:=@LINUX_2_6 @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.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,29,ssb)
+  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/ssb/description
-  Silicon Sonics Backplane glue code.
+define KernelPackage/input-evdev/description
+ Kernel modules for support of input device events
 endef
 
-$(eval $(call KernelPackage,ssb))
+$(eval $(call KernelPackage,input-evdev))
 
 
-define KernelPackage/bluetooth
+define KernelPackage/input-gpio-buttons
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid
+  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_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_HIDP
-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)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/bluetooth/btusb.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb)
+	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:=@LINUX_2_6
-  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.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/mmc/card/mmc_block.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block,1)
+  TITLE:=GPIO key support
+  DEPENDS:= @GPIO_SUPPORT
+  KCONFIG:=CONFIG_KEYBOARD_GPIO
+  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/mmc-at91
+define KernelPackage/input-gpio-encoder
   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,1)
+  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/mmc-at91/description
- Kernel support for MMC/SD cards on the AT91 target
+define KernelPackage/gpio-encoder/description
+ Kernel module to use rotary encoders connected to GPIO pins
 endef
 
-$(eval $(call KernelPackage,mmc-at91))
-
+$(eval $(call KernelPackage,input-gpio-encoder))
 
-# XXX: added a workaround for watchdog path changes
-ifeq ($(KERNEL),2.4)
-  WATCHDOG_DIR=char
-endif
-WATCHDOG_DIR?=watchdog
 
-define KernelPackage/atmel-wdt
+define KernelPackage/input-joydev
   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)
+  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/atmel-wdt/description
- AT32AP700x watchdog
+define KernelPackage/input-joydev/description
+  Kernel module for joystick support
 endef
 
-$(eval $(call KernelPackage,atmel-wdt))
+$(eval $(call KernelPackage,input-joydev))
 
 
-define KernelPackage/softdog
+define KernelPackage/input-polldev
   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)
+  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/softdog/description
- Software watchdog driver
+define KernelPackage/input-polldev/description
+ Kernel module for support of polled input devices
 endef
 
-$(eval $(call KernelPackage,softdog))
+$(eval $(call KernelPackage,input-polldev))
 
-define KernelPackage/rdc321x-wdt
+
+define KernelPackage/leds-alix
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=RDC321x watchdog
-  DEPENDS:=@TARGET_rdc
-  KCONFIG:=CONFIG_RDC321X_WDT
-  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,rdc321x_wdt)
+  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/rdc321x-wdt/description
-  RDC-321x watchdog driver
+define KernelPackage/leds-alix/description
+ Kernel module for PCengines ALIX LEDs
 endef
 
-$(eval $(call KernelPackage,rdc321x-wdt))
+$(eval $(call KernelPackage,leds-alix))
 
 
 define KernelPackage/leds-gpio
@@ -430,7 +418,7 @@ define KernelPackage/leds-gpio
   TITLE:=GPIO LED support
   DEPENDS:= @GPIO_SUPPORT
   KCONFIG:=CONFIG_LEDS_GPIO
-  FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.ko
   AUTOLOAD:=$(call AutoLoad,60,leds-gpio)
 endef
 
@@ -441,30 +429,13 @@ endef
 $(eval $(call KernelPackage,leds-gpio))
 
 
-define KernelPackage/ledtrig-adm5120-switch
+define KernelPackage/leds-net48xx
   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/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,ledtrig-adm5120-switch))
-
-
-define KernelPackage/leds-net48xx
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Soekris Net48xx LED support
-  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)
+  TITLE:=Soekris Net48xx LED support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-scx200
+  KCONFIG:=CONFIG_LEDS_NET48XX
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.ko
+  AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
 endef
 
 define KernelPackage/leds-net48xx/description
@@ -473,45 +444,44 @@ endef
 
 $(eval $(call KernelPackage,leds-net48xx))
 
-
-define KernelPackage/leds-wrap
+define KernelPackage/leds-net5501
   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)
+  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-wrap/description
- Kernel module for PCengines WRAP LEDs
+define KernelPackage/leds-net5501/description
+ Kernel module for Soekris Net5501 LEDs
 endef
 
-$(eval $(call KernelPackage,leds-wrap))
+$(eval $(call KernelPackage,leds-net5501))
 
 
-define KernelPackage/leds-alix
+define KernelPackage/leds-rb750
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=PCengines ALIX LED support
-  DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_LEDS_ALIX2
-  FILES:=$(LINUX_DIR)/drivers/leds/leds-alix2.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,leds-alix2)
+  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-alix/description
- Kernel module for PCengines ALIX LEDs
+define KernelPackage/leds-rb750/description
+ Kernel module for the LEDs on the MikroTik RouterBOARD 750.
 endef
 
-$(eval $(call KernelPackage,leds-alix))
+$(eval $(call KernelPackage,leds-rb750))
 
 
 define KernelPackage/leds-wndr3700-usb
   SUBMENU:=$(OTHER_MENU)
   TITLE:=WNDR3700 USB LED support
-  DEPENDS:= @TARGET_ar71xx
+  DEPENDS:=@TARGET_ar71xx
   KCONFIG:=CONFIG_LEDS_WNDR3700_USB
-  FILES:=$(LINUX_DIR)/drivers/leds/leds-wndr3700-usb.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wndr3700-usb.ko
   AUTOLOAD:=$(call AutoLoad,60,leds-wndr3700-usb)
 endef
 
@@ -522,42 +492,42 @@ endef
 $(eval $(call KernelPackage,leds-wndr3700-usb))
 
 
-define KernelPackage/leds-rb750
+define KernelPackage/leds-wrap
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=RouterBOARD 750 LED support
-  DEPENDS:=@TARGET_ar71xx
-  KCONFIG:=CONFIG_LEDS_RB750
-  FILES:=$(LINUX_DIR)/drivers/leds/leds-rb750.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,leds-rb750)
+  TITLE:=PCengines WRAP LED support
+  DEPENDS:=@TARGET_x86 +kmod-gpio-scx200
+  KCONFIG:=CONFIG_LEDS_WRAP
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.ko
+  AUTOLOAD:=$(call AutoLoad,50,leds-wrap)
 endef
 
-define KernelPackage/leds-rb750/description
- Kernel module for the LEDs on the MikroTik RouterBOARD 750.
+define KernelPackage/leds-wrap/description
+ Kernel module for PCengines WRAP LEDs
 endef
 
-$(eval $(call KernelPackage,leds-rb750))
+$(eval $(call KernelPackage,leds-wrap))
 
 
-define KernelPackage/ledtrig-netdev
+define KernelPackage/ledtrig-gpio
   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)
+  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-netdev/description
- Kernel module to drive LEDs based on network activity.
+define KernelPackage/ledtrig-gpio/description
+ Kernel module that allows LEDs to be controlled by gpio events.
 endef
 
-$(eval $(call KernelPackage,ledtrig-netdev))
+$(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.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.ko
   AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse)
 endef
 
@@ -568,340 +538,258 @@ 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:=$(OTHER_MENU)
-  TITLE:=Natsemi GPIO support
-  DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_NSC_GPIO
-  FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
-endef
-
-define KernelPackage/nsc-gpio/description
- Kernel module for Natsemi GPIO
-endef
-
-$(eval $(call KernelPackage,nsc-gpio))
-
-
-define KernelPackage/scx200-gpio
-  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)
-endef
-
-define KernelPackage/scx200-gpio/description
- Kernel module for SCX200 GPIO
-endef
-
-$(eval $(call KernelPackage,scx200-gpio))
-
-
-define KernelPackage/scx200-wdt
+define KernelPackage/ledtrig-netdev
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Natsemi SCX200 Watchdog support
-  DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_SCx200_WDT
-  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
+  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/scx200-wdt/description
- Kernel module for SCX200 Watchdog
+define KernelPackage/ledtrig-netdev/description
+ Kernel module to drive LEDs based on network activity.
 endef
 
-$(eval $(call KernelPackage,scx200-wdt))
+$(eval $(call KernelPackage,ledtrig-netdev))
 
 
-define KernelPackage/sc520-wdt
+define KernelPackage/lp
   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/sc520-wdt/description
-  Kernel module for SC520 Watchdog
+  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,sc520-wdt))
+$(eval $(call KernelPackage,lp))
 
 
-define KernelPackage/input-core
+define KernelPackage/mmc
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Input device core
-  DEPENDS:=@LINUX_2_6 @!TARGET_x86
-  KCONFIG:=CONFIG_INPUT
-  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,19,input-core)
+  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/input-core/description
- Kernel modules for support of input device
+define KernelPackage/mmc/description
+ Kernel support for MMC/SD cards
 endef
 
-$(eval $(call KernelPackage,input-core))
+$(eval $(call KernelPackage,mmc))
 
 
-define KernelPackage/input-evdev
+define KernelPackage/mmc-atmelmci
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Input event device
-  DEPENDS:=+!TARGET_x86:kmod-input-core
-  KCONFIG:=CONFIG_INPUT_EVDEV
-  FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,evdev)
+  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/input-evdev/description
- Kernel modules for support of input device events
+define KernelPackage/mmc-atmelmci/description
+ Kernel support for  Atmel Multimedia Card Interface.
 endef
 
-$(eval $(call KernelPackage,input-evdev))
+$(eval $(call KernelPackage,mmc-atmelmci,1))
 
 
-define KernelPackage/hid
+define KernelPackage/rfkill
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=HID Devices
-  DEPENDS:=+kmod-input-core +kmod-input-evdev @!TARGET_x86
-  KCONFIG:=CONFIG_HID
-  FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,61,hid)
+  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/hid/description
- Kernel modules for HID devices
+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,hid))
+$(eval $(call KernelPackage,rfkill))
 
 
-define KernelPackage/input-polldev
+define KernelPackage/softdog
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=Polled Input device support
-  DEPENDS:=+!TARGET_x86:kmod-input-core @LINUX_2_6
-  KCONFIG:=CONFIG_INPUT_POLLDEV
-  FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,input-polldev)
+  TITLE:=Software watchdog driver
+  KCONFIG:=CONFIG_SOFT_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.ko
+  AUTOLOAD:=$(call AutoLoad,50,softdog)
 endef
 
-define KernelPackage/input-polldev/description
- Kernel module for support of polled input devices
+define KernelPackage/softdog/description
+ Software watchdog driver
 endef
 
-$(eval $(call KernelPackage,input-polldev))
+$(eval $(call KernelPackage,softdog))
 
 
-define KernelPackage/input-gpio-keys
+define KernelPackage/ssb
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=GPIO key support
-  DEPENDS:= @GPIO_SUPPORT +!TARGET_x86:kmod-input-core
-  KCONFIG:=CONFIG_KEYBOARD_GPIO
-  FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,gpio_keys)
+  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/input-gpio-keys/description
- This driver implements support for buttons connected
- to GPIO pins of various CPUs (and some other chips).
+define KernelPackage/ssb/description
+  Silicon Sonics Backplane glue code.
 endef
 
-$(eval $(call KernelPackage,input-gpio-keys))
+$(eval $(call KernelPackage,ssb))
 
 
-define KernelPackage/input-gpio-buttons
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Polled GPIO buttons input device
-  DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
+define KernelPackage/textsearch
+SUBMENU:=$(OTHER_MENU)
+  TITLE:=Textsearch support is selected if needed
   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/input-joydev
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Joystick device support
-  DEPENDS:=+!TARGET_x86:kmod-input-core
-  KCONFIG:=CONFIG_INPUT_JOYDEV
-  FILES:=$(LINUX_DIR)/drivers/input/joydev.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,62,joydev)
+    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
 
-define KernelPackage/input-joydev/description
-  Kernel module for joystick support
-endef
+$(eval $(call KernelPackage,textsearch))
 
-$(eval $(call KernelPackage,input-joydev))
 
-define KernelPackage/input-rb532
+define KernelPackage/wdt-geode
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=RB532 button device support
-  DEPENDS:=+kmod-input-core @TARGET_rb532
-  KCONFIG:= \
-	CONFIG_INPUT_MISC=y \
-	CONFIG_INPUT_RB532_BUTTON
-  FILES:=$(LINUX_DIR)/drivers/input/misc/rb532_button.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,62,rb532_button)
+  TITLE:=Geode/LX Watchdog timer
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_GEODE_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,geodewdt)
 endef
 
-define KernelPackage/input-rb532/description
-  Kernel module for RB532 button
+define KernelPackage/wdt-geode/description
+  Kernel module for Geode watchdog timer.
 endef
 
-$(eval $(call KernelPackage,input-rb532))
+$(eval $(call KernelPackage,wdt-geode))
 
 
-define KernelPackage/mmc-atmelmci
+define KernelPackage/wdt-omap
   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)
+  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/mmc-atmelmci/description
- Kernel support for  Atmel Multimedia Card Interface.
+define KernelPackage/wdt-omap/description
+  Kernel module for TI omap watchdog timer.
 endef
 
-$(eval $(call KernelPackage,mmc-atmelmci,1))
+$(eval $(call KernelPackage,wdt-omap))
 
 
-define KernelPackage/cs5535-gpio
+define KernelPackage/wdt-sc520
   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,50,cs5535_gpio)
+  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/cs5535-gpio/description
- This package contains the AMD CS5535/CS5536 GPIO driver
+define KernelPackage/wdt-sc520/description
+  Kernel module for SC520 Watchdog
 endef
 
-$(eval $(call KernelPackage,cs5535-gpio))
+$(eval $(call KernelPackage,wdt-sc520))
 
 
-define KernelPackage/ixp4xx-beeper
+define KernelPackage/wdt-scx200
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=IXP4XX Beeper support
-  DEPENDS:=@TARGET_ixp4xx +kmod-input-core
-  KCONFIG:= \
-	CONFIG_INPUT_MISC=y \
-	CONFIG_INPUT_IXP4XX_BEEPER
-  FILES:=$(LINUX_DIR)/drivers/input/misc/ixp4xx-beeper.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ixp4xx-beeper)
-endef
-
-define KernelPackage/ixp4xx-beeper/description
- IXP4XX Beeper support
+  TITLE:=Natsemi SCX200 Watchdog support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SCx200_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
 endef
 
-$(eval $(call KernelPackage,ixp4xx-beeper))
-
-
-define KernelPackage/textsearch
-SUBMENU:=$(OTHER_MENU)
-  TITLE:=Textsearch support is selected if needed
-  DEPENDS:=@LINUX_2_6
-  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)
+define KernelPackage/wdt-scx200/description
+ Kernel module for SCX200 Watchdog
 endef
 
-$(eval $(call KernelPackage,textsearch))
+$(eval $(call KernelPackage,wdt-scx200))
 
 
-define KernelPackage/rfkill
+define KernelPackage/pwm
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=RF switch subsystem support
-  DEPENDS:=@TARGET_x86||TARGET_olpc||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx
-  KCONFIG:= \
-    CONFIG_RFKILL \
-    CONFIG_RFKILL_INPUT=y \
-    CONFIG_RFKILL_LEDS=y
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1)
-  FILES:= \
-    $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,rfkill)
-else
-  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)
-endif
-endef
-
-define KernelPackage/rfkill/description
-  Say Y here if you want to have control over RF switches
-  found on many WiFi and Bluetooth cards.
+  TITLE:=PWM generic API
+  KCONFIG:=CONFIG_GENERIC_PWM
+  FILES:=$(LINUX_DIR)/drivers/pwm/pwm.ko
+  AUTOLOAD:=$(call AutoLoad,50,pwm)
 endef
 
-$(eval $(call KernelPackage,rfkill))
-
-define KernelPackage/geodewdt
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Geode/LX Watchdog timer
-  DEPENDS:=@TARGET_x86 @LINUX_2_6
-  KCONFIG:=CONFIG_GEODE_WDT
-  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,geodewdt)
+define KernelPackage/pwm/description
+ Kernel module that implement a generic PWM API
 endef
 
-define KernelPackage/geodewdt/description
-  Kernel module for Geode watchdog timer.
-endef
+$(eval $(call KernelPackage,pwm))
 
-$(eval $(call KernelPackage,geodewdt))
 
-define KernelPackage/pc8736x-gpio
+define KernelPackage/pwm-gpio
   SUBMENU:=$(OTHER_MENU)
-  TITLE:=PC8736x GPIO support
-  DEPENDS:=@TARGET_x86
-  KCONFIG:=CONFIG_PC8736x_GPIO
-  FILES:=$(LINUX_DIR)/drivers/char/pc8736x_gpio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pc8736x_gpio)
+  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/pc8736x-gpio/description
- Kernel module for PC8736x GPIO
+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,pc8736x-gpio))
-
+$(eval $(call KernelPackage,pwm-gpio))