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/raspberry-pi | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/arm/kernel/raspberry-pi')
| -rw-r--r-- | target/arm/kernel/raspberry-pi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi index 486ec929b..86af8de40 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -9,6 +9,4 @@ CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_DMAER=y CONFIG_AEABI=y CONFIG_VFP=y -CONFIG_DTC=y -CONFIG_OF=y CONFIG_BCM2708_VCHIQ=y |