diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-03-26 10:09:13 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-03-26 10:09:13 +0000 |
| commit | 4ea6e1c9680c26e4d9d68d1017e3fa97856547b8 (patch) | |
| tree | 43830e464dca90cbee42d5170a2efb66d7b8dfc7 | |
| parent | ce75e4b893e6c66aea2cd04ede82fb27f7c1527d (diff) | |
| download | upstream-4ea6e1c9680c26e4d9d68d1017e3fa97856547b8.tar.gz upstream-4ea6e1c9680c26e4d9d68d1017e3fa97856547b8.tar.bz2 upstream-4ea6e1c9680c26e4d9d68d1017e3fa97856547b8.zip | |
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
SVN-Revision: 20436
| -rw-r--r-- | package/kernel/modules/other.mk | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 6c7f42c759..8d51f90d25 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -133,7 +133,6 @@ define KernelPackage/pcmcia-core CONFIG_PCMCIA \ CONFIG_CARDBUS \ CONFIG_PCCARD \ - CONFIG_PCCARD_NONSTATIC \ PCMCIA_DEBUG=n endef @@ -143,15 +142,15 @@ define KernelPackage/pcmcia-core/2.4 # CONFIG_CARDBUS FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds) + $(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 \ -# CONFIG_PCCARD_NONSTATIC \ # PCMCIA_DEBUG=n FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ @@ -169,20 +168,10 @@ $(eval $(call KernelPackage,pcmcia-core)) define KernelPackage/pcmcia-yenta SUBMENU:=$(OTHER_MENU) TITLE:=yenta socket driver - DEPENDS:=kmod-pcmcia-core + DEPENDS:=@LINUX_2_6 kmod-pcmcia-core KCONFIG:= \ - CONFIG_PCMCIA \ - CONFIG_CARDBUS \ + CONFIG_PCCARD_NONSTATIC \ 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:= \ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) |