diff options
| author | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
| commit | 800930b924c19a56b3a6e94ad351cd0715fb410d (patch) | |
| tree | 70158d97f68604d69da8da779507469cf930bf07 /target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch | |
| parent | 68c939ba0b0a0dda84e7a2ae370155be9a5593bc (diff) | |
| download | upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.gz upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.bz2 upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.zip | |
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y
rebased against linux-3.10.y stable (3.10.32). This should hopefully
make it easier for us in the future to leverage the raspberry/rpi-*
branches.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch b/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch new file mode 100644 index 0000000000..e173b8c215 --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0126-config-recreate-with-savedefconfig.patch @@ -0,0 +1,35 @@ +From b9054daf1190829201f0f8c099a699ac8cbe09ed Mon Sep 17 00:00:00 2001 +From: popcornmix <popcornmix@gmail.com> +Date: Thu, 12 Dec 2013 11:11:03 +0000 +Subject: [PATCH 126/174] config: recreate with savedefconfig + +--- + arch/arm/configs/bcmrpi_defconfig | 7 ------- + 1 file changed, 7 deletions(-) + +--- 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 |