diff options
| author | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
| commit | 933e74c07231e815bbfd9ed90073308eaf253a00 (patch) | |
| tree | f1733a1feb58ecf8f2d51eb9585edd2ee23f648b /target/linux/config | |
| parent | 0c8fa8e61a481d2d25c55e20c0ebd5176375e623 (diff) | |
| parent | 819692c26044aa5bb280a08fa017de9d55ca18b9 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 5a7dedd14..bbd2990e9 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -7,6 +7,9 @@ config ADK_KERNEL_NETDEVICES config ADK_KERNEL_NET_ETHERNET boolean +config ADK_KERNEL_PHYLIB + boolean + config ADK_KERNEL_MII boolean @@ -73,6 +76,17 @@ config ADK_KERNEL_VIA_RHINE default n help +config ADK_KERNEL_AR231X_ETHERNET + boolean + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_MII + select ADK_KERNEL_PHYLIB + default y if ADK_TARGET_SYSTEM_FON_FON2100 + default n + help + config ADK_KERNEL_KORINA boolean select ADK_KERNEL_NETDEVICES |