hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-04 06:54:27 -05:00
Code Issues Projects Releases Wiki Activity

kernel: move yenta_socket to kmod-pcmcia-core on 2.4, mark kmod-pcmcia-yenta as 2.6 only, move CONFIG_PCCARD_NONSTATIC from kmod-pcmcia-core to kmod-pcmcia-yenta KCONFIG

Browse Source 
SVN-Revision: 20436
This commit is contained in:
Nicolas Thill 2010-03-26 10:09:13 +00:00
parent ce75e4b893
commit 4ea6e1c968
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/kernel/modules/other.mk
View File

@ -133,7 +133,6 @@ define KernelPackage/pcmcia-core
CONFIG_PCMCIA \ CONFIG_PCMCIA \
CONFIG_CARDBUS \ CONFIG_CARDBUS \
CONFIG_PCCARD \ CONFIG_PCCARD \
CONFIG_PCCARD_NONSTATIC \
PCMCIA_DEBUG=n PCMCIA_DEBUG=n
endef endef
@ -143,15 +142,15 @@ define KernelPackage/pcmcia-core/2.4
# CONFIG_CARDBUS # CONFIG_CARDBUS
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \
AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds) $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds yenta_socket)
endef endef
define KernelPackage/pcmcia-core/2.6 define KernelPackage/pcmcia-core/2.6
# KCONFIG:= \ # KCONFIG:= \
# CONFIG_PCCARD \ # CONFIG_PCCARD \
# CONFIG_PCMCIA \ # CONFIG_PCMCIA \
# CONFIG_PCCARD_NONSTATIC \
# PCMCIA_DEBUG=n # PCMCIA_DEBUG=n
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
@ -169,20 +168,10 @@ $(eval $(call KernelPackage,pcmcia-core))
define KernelPackage/pcmcia-yenta define KernelPackage/pcmcia-yenta
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=yenta socket driver TITLE:=yenta socket driver
DEPENDS:=kmod-pcmcia-core DEPENDS:=@LINUX_2_6 kmod-pcmcia-core
KCONFIG:= \ KCONFIG:= \
CONFIG_PCMCIA \ CONFIG_PCCARD_NONSTATIC \
CONFIG_CARDBUS \
CONFIG_YENTA CONFIG_YENTA
endef
define KernelPackage/pcmcia-yenta/2.4
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,41,yenta_socket)
endef
define KernelPackage/pcmcia-yenta/2.6
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)