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 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
11 index 665b01e..41b90b4 100644
12 --- a/arch/arm/configs/bcmrpi_defconfig
13 +++ b/arch/arm/configs/bcmrpi_defconfig
14 @@ -484,6 +484,8 @@ CONFIG_AR5523=m
16 # CONFIG_B43_PHY_N is not set
19 +CONFIG_BRCMFMAC_USB=y
23 @@ -524,6 +526,7 @@ CONFIG_INPUT_POWERMATE=m
24 CONFIG_INPUT_YEALINK=m
27 +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
28 CONFIG_INPUT_ADXL34X=m
29 CONFIG_INPUT_CMA3000=m
31 @@ -545,6 +548,7 @@ CONFIG_BCM_VC_CMA=y
39 @@ -724,6 +728,7 @@ CONFIG_RADIO_SI470X=y
47 @@ -735,6 +740,15 @@ CONFIG_RADIO_SAA7706H=m
48 CONFIG_RADIO_TEF6862=m
51 +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
52 +CONFIG_VIDEO_UDA1342=m
53 +CONFIG_VIDEO_SONY_BTF_MPX=m
54 +CONFIG_VIDEO_TVP5150=m
55 +CONFIG_VIDEO_TW2804=m
56 +CONFIG_VIDEO_TW9903=m
57 +CONFIG_VIDEO_TW9906=m
58 +CONFIG_VIDEO_OV7640=m
59 +CONFIG_VIDEO_MT9V011=m
62 # CONFIG_BACKLIGHT_GENERIC is not set
63 @@ -783,6 +797,7 @@ CONFIG_HID_CYPRESS=m
64 CONFIG_HID_DRAGONRISE=m
71 @@ -1042,6 +1057,7 @@ CONFIG_F2FS_FS=y
79 @@ -1116,8 +1132,6 @@ CONFIG_CRYPTO_CBC=y
85 CONFIG_CRYPTO_SHA1_ARM=m
86 CONFIG_CRYPTO_SHA512=m
87 CONFIG_CRYPTO_TGR192=m