From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- target/arm/kernel/raspberry-pi | 2 -- 1 file changed, 2 deletions(-) (limited to 'target/arm/kernel/raspberry-pi') 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 -- cgit v1.2.3