diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /target/linux/config/Config.in.netdevice | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'target/linux/config/Config.in.netdevice')
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index b5390e92d..28a37dbef 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -340,6 +340,7 @@ config ADK_KPACKAGE_KMOD_P54_USB select ADK_PACKAGE_P54_FIRMWARE select ADK_KERNEL_EXPERIMENTAL select ADK_KPACKAGE_KMOD_MAC80211 + select ADK_KPACKAGE_KMOD_CRC_CCITT depends on ADK_PACKAGE_KMOD_USB_CONTROLLER default n help |