diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-12 16:46:45 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-12 16:46:45 +0200 |
commit | 11fe1b27b58fb4da9cb5f89347bf3c409c01e414 (patch) | |
tree | b0041e876d76f61cadb379bb260355adcc1b12d7 /target | |
parent | 1ba34384a5208092b2d82d3b4849384fe2b5ff88 (diff) | |
parent | 821a8ee9f9b5dc541712a8f23938fc4ac8222d1f (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r-- | target/linux/config/Config.in.fs | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.misc | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 7 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter | 5 |
4 files changed, 2 insertions, 16 deletions
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index b981c530f..e6f7c8043 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -128,9 +128,6 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS data forks and creator codes, but it also has several UNIX style features such as file ownership and permissions. - -source "package/ntfs-3g/Config.in" - config ADK_KPACKAGE_KMOD_NTFS_FS prompt "kmod-fs-ntfs...................... NTFS file system support" tristate diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index b7aad4e23..bf62a5df7 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -87,7 +87,4 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6 default n help - -source package/exmap/Config.in.kmod - endmenu diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 5b5a6e009..e266ddcf4 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -309,10 +309,7 @@ endmenu menu "ATM driver support" depends on ADK_TARGET_WITH_DSL - -source package/sangam-atm/Config.in -source package/sangam-atm/Config.in.kmod -source package/sangam-atm/Config.in.fw - +source package/sangam-atm/Config.in.manual endmenu + endmenu diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index dbc686b0a..ce6e80f15 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -154,9 +154,4 @@ menu "Ethernet bridge firewalling" source target/linux/config/Config.in.netfilter.ebt endmenu -menu "Netfilter Addons" -source package/ipset/Config.in.kmod -source package/rtsp/Config.in.kmod -endmenu - endmenu |