package/kernel: use common gpio- & wdt- prefixes for GPIO and watchdog module names

[openwrt.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 10db180e5f1f023c3fa94a5c1a436e6cb47d43e9..56b9da71e53f5781491a2d400e230504d4576a18 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -100,105 +100,6 @@ 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 \
-  )
-endef
-
-define KernelPackage/pcspkr/description
- This enables sounds (tones) through the pc speaker
-endef
-
-$(eval $(call KernelPackage,pcspkr))
-
-define KernelPackage/pcmcia-core
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=PCMCIA/CardBus support
-  DEPENDS:=@PCMCIA_SUPPORT
-  KCONFIG:= \
-       CONFIG_PCMCIA \
-       CONFIG_CARDBUS \
-       CONFIG_PCCARD \
-       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,25,pcmcia_core ds yenta_socket)
-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)
-endef
-
-define KernelPackage/pcmcia-core/description
- Kernel support for PCMCIA/CardBus controllers
-endef
-
-$(eval $(call KernelPackage,pcmcia-core))
-
-
-define KernelPackage/pcmcia-yenta
-  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)
-endef
-
-$(eval $(call KernelPackage,pcmcia-yenta))
-
-
-define KernelPackage/pcmcia-serial
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Serial devices support
-  DEPENDS:=kmod-pcmcia-core
-  KCONFIG:= \
-       CONFIG_PCMCIA_SERIAL_CS \
-       CONFIG_SERIAL_8250_CS
-  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
-endef
-
-define KernelPackage/pcmcia-serial/2.4
-#  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS
-  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/pcmcia-serial/2.6
-#  KCONFIG:=CONFIG_SERIAL_8250_CS
-  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
-endef
-
-define KernelPackage/pcmcia-serial/description
- Kernel support for PCMCIA/CardBus serial devices
-endef
-
-$(eval $(call KernelPackage,pcmcia-serial))
 
 define KernelPackage/ssb
   SUBMENU:=$(OTHER_MENU)
@@ -492,7 +393,7 @@ endef
 $(eval $(call KernelPackage,gpio-dev))
 
 
-define KernelPackage/nsc-gpio
+define KernelPackage/gpio-nsc
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi GPIO support
   DEPENDS:=@TARGET_x86
@@ -508,7 +409,7 @@ endef
 $(eval $(call KernelPackage,nsc-gpio))
 
 
-define KernelPackage/scx200-gpio
+define KernelPackage/gpio-scx200
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 GPIO support
   DEPENDS:=@TARGET_x86 +kmod-nsc-gpio
@@ -524,7 +425,7 @@ endef
 $(eval $(call KernelPackage,scx200-gpio))
 
 
-define KernelPackage/scx200-wdt
+define KernelPackage/wdt-scx200
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 Watchdog support
   DEPENDS:=@TARGET_x86
@@ -540,7 +441,7 @@ endef
 $(eval $(call KernelPackage,scx200-wdt))
 
 
-define KernelPackage/sc520-wdt
+define KernelPackage/wdt-sc520
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SC520 Watchdog support
   DEPENDS:=@TARGET_x86
@@ -690,7 +591,7 @@ endef
 $(eval $(call KernelPackage,mmc-atmelmci,1))
 
 
-define KernelPackage/cs5535-gpio
+define KernelPackage/gpio-cs5535
   SUBMENU:=$(OTHER_MENU)
   TITLE:=AMD CS5535/CS5536 GPIO driver
   DEPENDS:=@TARGET_x86
@@ -752,7 +653,7 @@ endef
 
 $(eval $(call KernelPackage,rfkill))
 
-define KernelPackage/geodewdt
+define KernelPackage/wdt-geode
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Geode/LX Watchdog timer
   DEPENDS:=@TARGET_x86 @LINUX_2_6
@@ -767,7 +668,7 @@ endef
 
 $(eval $(call KernelPackage,geodewdt))
 
-define KernelPackage/pc8736x-gpio
+define KernelPackage/gpio-pc8736x
   SUBMENU:=$(OTHER_MENU)
   TITLE:=PC8736x GPIO support
   DEPENDS:=@TARGET_x86