1 From 6a0570d2c5ae88c6170484ec7b521994bbb450b1 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Fri, 23 Jan 2015 12:04:59 +0000
4 Subject: [PATCH 073/114] config: Restore some missing options
7 arch/arm/configs/bcmrpi_defconfig | 18 ++++++++++++++++--
8 1 file changed, 16 insertions(+), 2 deletions(-)
10 --- a/arch/arm/configs/bcmrpi_defconfig
11 +++ b/arch/arm/configs/bcmrpi_defconfig
12 @@ -484,6 +484,8 @@ CONFIG_AR5523=m
14 # CONFIG_B43_PHY_N is not set
17 +CONFIG_BRCMFMAC_USB=y
21 @@ -524,6 +526,7 @@ CONFIG_INPUT_POWERMATE=m
22 CONFIG_INPUT_YEALINK=m
25 +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
26 CONFIG_INPUT_ADXL34X=m
27 CONFIG_INPUT_CMA3000=m
29 @@ -545,6 +548,7 @@ CONFIG_BCM_VC_CMA=y
37 @@ -724,6 +728,7 @@ CONFIG_RADIO_SI470X=y
45 @@ -735,6 +740,15 @@ CONFIG_RADIO_SAA7706H=m
46 CONFIG_RADIO_TEF6862=m
49 +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
50 +CONFIG_VIDEO_UDA1342=m
51 +CONFIG_VIDEO_SONY_BTF_MPX=m
52 +CONFIG_VIDEO_TVP5150=m
53 +CONFIG_VIDEO_TW2804=m
54 +CONFIG_VIDEO_TW9903=m
55 +CONFIG_VIDEO_TW9906=m
56 +CONFIG_VIDEO_OV7640=m
57 +CONFIG_VIDEO_MT9V011=m
60 # CONFIG_BACKLIGHT_GENERIC is not set
61 @@ -783,6 +797,7 @@ CONFIG_HID_CYPRESS=m
62 CONFIG_HID_DRAGONRISE=m
69 @@ -1042,6 +1057,7 @@ CONFIG_F2FS_FS=y
77 @@ -1116,8 +1132,6 @@ CONFIG_CRYPTO_CBC=y
83 CONFIG_CRYPTO_SHA1_ARM=m
84 CONFIG_CRYPTO_SHA512=m
85 CONFIG_CRYPTO_TGR192=m