From 088a50c52e6f720fdbd321871fb3e30e241508c5 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Mon, 6 Jul 2015 16:34:35 -0400
Subject: Linux v4.2-rc1

- Disable debug options.
- Add patch to fix perf build
---
 config-armv7 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'config-armv7')

diff --git a/config-armv7 b/config-armv7
index 5be807456..73428e50c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -247,7 +247,8 @@ CONFIG_TI_CPTS=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_TI_EMIF=m
 CONFIG_DRM_TILCDC=m
-# CONFIG_DRM_TILCDC_SLAVE_COMPAT is not set
+# We only need this until the BBB dts is actually updated
+CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_SPI_DAVINCI=m
 CONFIG_SND_DAVINCI_SOC=m
 CONFIG_SND_DAVINCI_SOC_I2S=m
@@ -264,6 +265,8 @@ CONFIG_MFD_TPS65218=m
 CONFIG_REGULATOR_TPS65218=m
 CONFIG_INPUT_TPS65218_PWRBUTTON=m
 CONFIG_VIDEO_AM437X_VPFE=m
+CONFIG_UIO_PRUSS=m
+CONFIG_WKUP_M3_RPROC=m
 
 # QCom
 CONFIG_ARCH_MSM8X60=y
@@ -332,6 +335,7 @@ CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC_STORM=m
 CONFIG_PHY_QCOM_UFS=m
+CONFIG_HWSPINLOCK_QCOM=m
 
 # i.MX
 # CONFIG_MXC_DEBUG_BOARD is not set
@@ -360,6 +364,7 @@ CONFIG_USB_CHIPIDEA_HOST=y
 # CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_FSL_USB2=m
 CONFIG_NET_VENDOR_FREESCALE=y
+# CONFIG_GIANFAR is not set
 CONFIG_FEC=m
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
@@ -383,9 +388,9 @@ CONFIG_IMX2_WDT=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_RTC_DRV_SNVS=m
+CONFIG_FB_MXS=m
 # CONFIG_FB_MX3 is not set
 # CONFIG_FB_IMX is not set
-# CONFIG_FB_MXS is not set
 
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
-- 
cgit