6918ea2484
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From d373452a8e28350103ada064054898c3b5445d06 Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Thu, 12 Dec 2013 11:11:03 +0000
|
|
Subject: [PATCH 126/196] config: recreate with savedefconfig
|
|
|
|
---
|
|
arch/arm/configs/bcmrpi_defconfig | 7 -------
|
|
1 file changed, 7 deletions(-)
|
|
|
|
diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
|
|
index d0328d8..75c17bc 100644
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
|
@@ -734,14 +734,9 @@ CONFIG_SND_USB_CAIAQ=m
|
|
CONFIG_SND_USB_CAIAQ_INPUT=y
|
|
CONFIG_SND_USB_6FIRE=m
|
|
CONFIG_SND_SOC=m
|
|
-CONFIG_SND_SOC_DMAENGINE_PCM=y
|
|
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
|
|
CONFIG_SND_BCM2708_SOC_I2S=m
|
|
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
|
|
CONFIG_SND_BCM2708_SOC_RPI_DAC=m
|
|
-CONFIG_SND_SOC_I2C_AND_SPI=m
|
|
-CONFIG_SND_SOC_PCM5102A=m
|
|
-CONFIG_SND_SOC_PCM1794A=m
|
|
CONFIG_SOUND_PRIME=m
|
|
CONFIG_HIDRAW=y
|
|
CONFIG_HID_A4TECH=m
|
|
@@ -935,8 +930,6 @@ CONFIG_RTC_DRV_PCF2123=m
|
|
CONFIG_RTC_DRV_RX4581=m
|
|
CONFIG_DMADEVICES=y
|
|
CONFIG_DMA_BCM2708=m
|
|
-CONFIG_DMA_ENGINE=y
|
|
-CONFIG_DMA_VIRTUAL_CHANNELS=m
|
|
CONFIG_UIO=m
|
|
CONFIG_UIO_PDRV=m
|
|
CONFIG_UIO_PDRV_GENIRQ=m
|
|
--
|
|
1.9.1
|
|
|