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

package/sangam-atm/Config.in.fw

@@ -0,0 +1,16 @@
+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
+

target/linux/config/Config.in.netdevice

@@ -249,6 +249,7 @@ endmenu
 menu "ATM driver support"
 
 source package/sangam-atm/Config.in
+source package/sangam-atm/Config.in.fw
 
 endmenu