85 lines
2.1 KiB
Diff
85 lines
2.1 KiB
Diff
From 6a0570d2c5ae88c6170484ec7b521994bbb450b1 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Fri, 23 Jan 2015 12:04:59 +0000
|
|
Subject: [PATCH 073/114] config: Restore some missing options
|
|
|
|
---
|
|
arch/arm/configs/bcmrpi_defconfig | 18 ++++++++++++++++--
|
|
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
|
@@ -484,6 +484,8 @@ CONFIG_AR5523=m
|
|
CONFIG_B43=m
|
|
# CONFIG_B43_PHY_N is not set
|
|
CONFIG_B43LEGACY=m
|
|
+CONFIG_BRCMFMAC=m
|
|
+CONFIG_BRCMFMAC_USB=y
|
|
CONFIG_HOSTAP=m
|
|
CONFIG_LIBERTAS=m
|
|
CONFIG_LIBERTAS_USB=m
|
|
@@ -524,6 +526,7 @@ CONFIG_INPUT_POWERMATE=m
|
|
CONFIG_INPUT_YEALINK=m
|
|
CONFIG_INPUT_CM109=m
|
|
CONFIG_INPUT_UINPUT=m
|
|
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
|
|
CONFIG_INPUT_ADXL34X=m
|
|
CONFIG_INPUT_CMA3000=m
|
|
CONFIG_SERIO=m
|
|
@@ -545,6 +548,7 @@ CONFIG_BCM_VC_CMA=y
|
|
CONFIG_BCM_VC_SM=y
|
|
CONFIG_I2C=y
|
|
CONFIG_I2C_CHARDEV=m
|
|
+CONFIG_I2C_MUX=m
|
|
CONFIG_I2C_BCM2708=m
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_BCM2708=m
|
|
@@ -724,6 +728,7 @@ CONFIG_RADIO_SI470X=y
|
|
CONFIG_USB_SI470X=m
|
|
CONFIG_I2C_SI470X=m
|
|
CONFIG_RADIO_SI4713=m
|
|
+CONFIG_I2C_SI4713=m
|
|
CONFIG_USB_MR800=m
|
|
CONFIG_USB_DSBR=m
|
|
CONFIG_RADIO_SHARK=m
|
|
@@ -735,6 +740,15 @@ CONFIG_RADIO_SAA7706H=m
|
|
CONFIG_RADIO_TEF6862=m
|
|
CONFIG_RADIO_WL1273=m
|
|
CONFIG_RADIO_WL128X=m
|
|
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
|
|
+CONFIG_VIDEO_UDA1342=m
|
|
+CONFIG_VIDEO_SONY_BTF_MPX=m
|
|
+CONFIG_VIDEO_TVP5150=m
|
|
+CONFIG_VIDEO_TW2804=m
|
|
+CONFIG_VIDEO_TW9903=m
|
|
+CONFIG_VIDEO_TW9906=m
|
|
+CONFIG_VIDEO_OV7640=m
|
|
+CONFIG_VIDEO_MT9V011=m
|
|
CONFIG_FB=y
|
|
CONFIG_FB_BCM2708=y
|
|
# CONFIG_BACKLIGHT_GENERIC is not set
|
|
@@ -783,6 +797,7 @@ CONFIG_HID_CYPRESS=m
|
|
CONFIG_HID_DRAGONRISE=m
|
|
CONFIG_HID_EMS_FF=m
|
|
CONFIG_HID_ELECOM=m
|
|
+CONFIG_HID_ELO=m
|
|
CONFIG_HID_EZKEY=m
|
|
CONFIG_HID_HOLTEK=m
|
|
CONFIG_HID_KEYTOUCH=m
|
|
@@ -1042,6 +1057,7 @@ CONFIG_F2FS_FS=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V3_ACL=y
|
|
CONFIG_NFS_V4=y
|
|
+CONFIG_NFS_SWAP=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_NFS_FSCACHE=y
|
|
CONFIG_NFSD=m
|
|
@@ -1116,8 +1132,6 @@ CONFIG_CRYPTO_CBC=y
|
|
CONFIG_CRYPTO_CTS=m
|
|
CONFIG_CRYPTO_XTS=m
|
|
CONFIG_CRYPTO_XCBC=m
|
|
-CONFIG_CRYPTO_MD5=y
|
|
-CONFIG_CRYPTO_SHA1=y
|
|
CONFIG_CRYPTO_SHA1_ARM=m
|
|
CONFIG_CRYPTO_SHA512=m
|
|
CONFIG_CRYPTO_TGR192=m
|