diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/arm/kernel/cubox-i | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/kernel/cubox-i')
| -rw-r--r-- | target/arm/kernel/cubox-i | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/cubox-i index 0b56db7d7..02b35f76b 100644 --- a/target/arm/kernel/cubox-i +++ b/target/arm/kernel/cubox-i @@ -15,9 +15,5 @@ CONFIG_NEON=y CONFIG_PCI_IMX6=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_NET_VENDOR_FREESCALE=y -CONFIG_FEC=y -CONFIG_PHYLIB=y -CONFIG_AT803X_PHY=y CONFIG_ATAGS=y CONFIG_CMDLINE_FORCE=y |