Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 35 insertions, 32 deletions

diff --git a/package/sangam-atm/Config.in.fw b/package/sangam-atm/Config.in.fw
deleted file mode 100644
index 75bcd057b..000000000
--- a/package/sangam-atm/Config.in.fw
+++ /dev/null
@@ -1,16 +0,0 @@
-choice
-prompt "Firmware type"
-depends on ADK_PACKAGE_KMOD_SANGAM_ATM
-
-config ADK_PACKAGE_SANGAM_ATM_ANNEX_B
-       prompt "Annex B, ADSL over ISDN"
-       boolean
-       help
-
-config ADK_PACKAGE_SANGAM_ATM_ANNEX_A
-       prompt "Annex A, ADSL over POTS"
-       boolean
-       help
-
-endchoice
-
diff --git a/package/sangam-atm/Config.in.manual b/package/sangam-atm/Config.in.manual
new file mode 100644
index 000000000..5fae63474
--- /dev/null
+++ b/package/sangam-atm/Config.in.manual
@@ -0,0 +1,33 @@
+config ADK_COMPILE_SANGAM_ATM
+	tristate
+	depends on ADK_PACKAGE_KMOD_SANGAM_ATM
+	default n
+
+config ADK_PACKAGE_KMOD_SANGAM_ATM
+	prompt "kmod-sangam-atm........ DSL modem driver for TI AR7 boards"
+	tristate
+	depends on ADK_LINUX_MIPS_AG241
+	default n
+	select ADK_KPACKAGE_KMOD_FW_LOADER
+	select ADK_KPACKAGE_KMOD_ATM
+	select ADK_COMPILE_SANGAM_ATM
+	help
+	  DSL modem driver for TI AR7 boards
+
+choice
+prompt "Firmware type"
+depends on ADK_PACKAGE_KMOD_SANGAM_ATM
+
+config ADK_PACKAGE_SANGAM_ATM_ANNEX_B
+       prompt "Annex B, ADSL over ISDN"
+       boolean
+       help
+
+config ADK_PACKAGE_SANGAM_ATM_ANNEX_A
+       prompt "Annex A, ADSL over POTS"
+       boolean
+       help
+
+endchoice
+
+
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