diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-19 18:33:32 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-19 18:33:32 +0100 |
commit | 98e07066854de558bb5651b7305d2da527048d0b (patch) | |
tree | 38a598508fbf7d525de0c8ab7454081042af347c /target/linux/config | |
parent | 25631be7315cdddc0cf2ea273f3e06332128d36d (diff) | |
parent | 0102d12701a8634300c4b174e5bbeb898218ba18 (diff) |
Merge branch 'master' of openadk.org:/git/openadk
Diffstat (limited to 'target/linux/config')
-rw-r--r-- | target/linux/config/Config.in.fs | 4 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 7 | ||||
-rw-r--r-- | target/linux/config/Config.in.network | 56 |
3 files changed, 42 insertions, 25 deletions
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index a9c2668ae..8631b486e 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -17,6 +17,10 @@ config ADK_KPACKAGE_KMOD_EXPORTFS default n help +config ADK_KERNEL_SQUASHFS + boolean + default n + config ADK_KERNEL_EXT2_FS boolean default n diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index cef62da0b..f743b8271 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -245,4 +245,11 @@ config ADK_KERNEL_RT2X00_DEBUG help endmenu + +menu "ATM driver support" + +source package/sangam-atm/Config.in + +endmenu + endmenu diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 349f4a9fd..68d8f2d8a 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -40,23 +40,29 @@ config ADK_KERNEL_LLC tristate default n -#config ADK_KPACKAGE_KMOD_ATM -# prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)" -# tristate -# default n -# help -# ATM is a high-speed networking technology for Local Area Networks -# and Wide Area Networks. It uses a fixed packet size and is -# connection oriented, allowing for the negotiation of minimum -# bandwidth requirements. -# -# In order to participate in an ATM network, your Linux box needs an -# ATM networking card. If you have that, say Y here and to the driver -# of your ATM card below. -# -# Note that you need a set of user-space programs to actually make use -# of ATM. See the file <file:Documentation/networking/atm.txt> for -# further details. +config ADK_KPACKAGE_KMOD_ATM + prompt "kmod-atm.......................... Asynchronous Transfer Mode (ATM)" + tristate + default n + help + ATM is a high-speed networking technology for Local Area Networks + and Wide Area Networks. It uses a fixed packet size and is + connection oriented, allowing for the negotiation of minimum + bandwidth requirements. + + In order to participate in an ATM network, your Linux box needs an + ATM networking card. If you have that, say Y here and to the driver + of your ATM card below. + + Note that you need a set of user-space programs to actually make use + of ATM. See the file <file:Documentation/networking/atm.txt> for + further details. + +config ADK_KPACKAGE_KMOD_ATM_BR2684 + prompt "kmod-atm-br2684................... BR2684 ATM module" + tristate + default n + help config ADK_KPACKAGE_KMOD_BRIDGE prompt "kmod-net-bridge................... 802.1d Ethernet Bridging" @@ -193,14 +199,14 @@ config ADK_KPACKAGE_KMOD_PPP_MPPE See http://pptpclient.sourceforge.net/ for information on configuring PPTP clients and servers to utilize this method. -#config ADK_KPACKAGE_KMOD_PPPOATM -# prompt "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support" -# tristate -# default n -# depends on ADK_KPACKAGE_KMOD_PPP -# select ADK_KPACKAGE_KMOD_ATM -# help -# Support for PPP over ATM +config ADK_KPACKAGE_KMOD_PPPOATM + prompt "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support" + tristate + default n + depends on ADK_KPACKAGE_KMOD_PPP + select ADK_KPACKAGE_KMOD_ATM + help + Support for PPP over ATM config ADK_KPACKAGE_KMOD_PPPOE prompt "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support" |