X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=56b9da71e53f5781491a2d400e230504d4576a18;hb=7716517d56d4835f23427e2f3ba87528340b0845;hp=fbaf7638da3391d28bc53593fb2fb168ee2075f3;hpb=25aa2281f005cc22c4bad72c3b271faa283051b5;p=openwrt.git

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index fbaf7638da..56b9da71e5 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,14 +7,6 @@
 
 OTHER_MENU:=Other modules
 
-define KernelPackage/block2mtd
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Block device MTD emulation
-  KCONFIG:=CONFIG_MTD_BLOCK2MTD
-  FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX)
-endef
-$(eval $(call KernelPackage,block2mtd))
-
 define KernelPackage/crc-itu-t
   SUBMENU:=$(OTHER_MENU)
   TITLE:=CRC ITU-T V.41 support
@@ -108,130 +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-au1000
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=RMI/AMD Au1000 PCMCIA support
-  DEPENDS:=kmod-pcmcia-core @TARGET_au1000
-  FILES:=$(LINUX_DIR)/drivers/pcmcia/au1x00_ss.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,41,au1x00_ss)
-endef
-
-$(eval $(call KernelPackage,pcmcia-au1000))
-
-define KernelPackage/pcmcia-bcm63xx
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=Broadcom BCM63xx PCMCIA support
-  DEPENDS:=kmod-pcmcia-core @TARGET_brcm63xx
-  KCONFIG:=CONFIG_PCMCIA_BCM63XX
-  FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,41,bcm63xx_pcmcia)
-endef
-
-define KernelPackage/pcmcia-bcm63xx/description
-  Kernel support for PCMCIA/CardBus controller on the BCM63xx SoC
-endef
-
-$(eval $(call KernelPackage,pcmcia-bcm63xx))
-
-define KernelPackage/pcmcia-serial
-  SUBMENU:=$(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)
@@ -361,43 +229,12 @@ endef
 $(eval $(call KernelPackage,mmc))
 
 
-define KernelPackage/mmc-at91
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=MMC/SD Card Support on AT91
-  DEPENDS:=@TARGET_at91 +kmod-mmc
-  KCONFIG:=CONFIG_MMC_AT91
-  FILES:=$(LINUX_DIR)/drivers/mmc/host/at91_mci.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,90,at91_mci,1)
-endef
-
-define KernelPackage/mmc-at91/description
- Kernel support for MMC/SD cards on the AT91 target
-endef
-
-$(eval $(call KernelPackage,mmc-at91))
-
-
 # XXX: added a workaround for watchdog path changes
 ifeq ($(KERNEL),2.4)
   WATCHDOG_DIR=char
 endif
 WATCHDOG_DIR?=watchdog
 
-define KernelPackage/atmel-wdt
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=AT32AP700x watchdog
-  DEPENDS:=@TARGET_avr32
-  KCONFIG:=CONFIG_AT32AP700X_WDT
-  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/at32ap700x_wdt.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,at32ap700x_wdt)
-endef
-
-define KernelPackage/atmel-wdt/description
- AT32AP700x watchdog
-endef
-
-$(eval $(call KernelPackage,atmel-wdt))
-
 
 define KernelPackage/softdog
   SUBMENU:=$(OTHER_MENU)
@@ -413,21 +250,6 @@ endef
 
 $(eval $(call KernelPackage,softdog))
 
-define KernelPackage/rdc321x-wdt
-  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)
-endef
-
-define KernelPackage/rdc321x-wdt/description
-  RDC-321x watchdog driver
-endef
-
-$(eval $(call KernelPackage,rdc321x-wdt))
-
 
 define KernelPackage/leds-gpio
   SUBMENU:=$(OTHER_MENU)
@@ -445,23 +267,6 @@ endef
 $(eval $(call KernelPackage,leds-gpio))
 
 
-define KernelPackage/ledtrig-adm5120-switch
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=LED ADM5120 Switch Port Status Trigger
-  DEPENDS:=@TARGET_adm5120
-  KCONFIG:=CONFIG_LEDS_TRIGGER_ADM5120_SWITCH
-  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-adm5120-switch.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ledtrig-adm5120-switch)
-endef
-
-define KernelPackage/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
@@ -513,7 +318,7 @@ $(eval $(call KernelPackage,leds-alix))
 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)
   AUTOLOAD:=$(call AutoLoad,60,leds-wndr3700-usb)
@@ -588,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
@@ -604,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
@@ -620,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
@@ -636,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
@@ -770,24 +575,6 @@ endef
 
 $(eval $(call KernelPackage,input-joydev))
 
-define KernelPackage/input-rb532
-  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)
-endef
-
-define KernelPackage/input-rb532/description
-  Kernel module for RB532 button
-endef
-
-$(eval $(call KernelPackage,input-rb532))
-
-
 define KernelPackage/mmc-atmelmci
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Amtel MMC Support
@@ -804,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
@@ -820,24 +607,6 @@ endef
 $(eval $(call KernelPackage,cs5535-gpio))
 
 
-define KernelPackage/ixp4xx-beeper
-  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
-endef
-
-$(eval $(call KernelPackage,ixp4xx-beeper))
-
-
 define KernelPackage/textsearch
 SUBMENU:=$(OTHER_MENU)
   TITLE:=Textsearch support is selected if needed
@@ -884,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
@@ -899,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