projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ab68faf
)
[package] kernel: move yenta_socket to kmod-pcmcia-core on 2.4, mark kmod-pcmcia...
author
Nicolas Thill
<nico@openwrt.org>
Fri, 26 Mar 2010 10:09:13 +0000
(10:09 +0000)
committer
Nicolas Thill
<nico@openwrt.org>
Fri, 26 Mar 2010 10:09:13 +0000
(10:09 +0000)
SVN-Revision: 20436
package/kernel/modules/other.mk
patch
|
blob
|
history
diff --git
a/package/kernel/modules/other.mk
b/package/kernel/modules/other.mk
index 6c7f42c759464b4c128646eeea28473c3dca61e7..8d51f90d25a23299210b1d1d4f325acc64cb2ca8 100644
(file)
--- 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_PCMCIA \
CONFIG_CARDBUS \
CONFIG_PCCARD \
- CONFIG_PCCARD_NONSTATIC \
PCMCIA_DEBUG=n
endef
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) \
# 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 \
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) \
# 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
define KernelPackage/pcmcia-yenta
SUBMENU:=$(OTHER_MENU)
TITLE:=yenta socket driver
- DEPENDS:=kmod-pcmcia-core
+ DEPENDS:=
@LINUX_2_6
kmod-pcmcia-core
KCONFIG:= \
KCONFIG:= \
- CONFIG_PCMCIA \
- CONFIG_CARDBUS \
+ CONFIG_PCCARD_NONSTATIC \
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:= \
$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)
FILES:= \
$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX)