diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
| commit | 070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch) | |
| tree | 1a4cf65e381c5ce777316fb67e69018feb741f8f /package/linux-atm | |
| parent | d82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff) | |
| parent | 644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff) | |
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/build.mk
Diffstat (limited to 'package/linux-atm')
| -rw-r--r-- | package/linux-atm/Config.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package/linux-atm/Config.in b/package/linux-atm/Config.in index 991da7ecb..e89db02d1 100644 --- a/package/linux-atm/Config.in +++ b/package/linux-atm/Config.in @@ -7,6 +7,7 @@ config ADK_PACKAGE_LIBATM prompt "libatm............................. ATM Library for Linux" tristate default n + depends on !ADK_HOST_FREEBSD help ATM Library for linux @@ -15,6 +16,7 @@ config ADK_PACKAGE_BR2684CTL tristate default n select ADK_PACKAGE_LIBATM + depends on !ADK_HOST_FREEBSD help Utility for setting up ATM RFC2684 bridging mode. (Useful for PPPoE) |