Skip to content

Commit 2dae3c6

Browse files
committed
config: recreate with savedefconfig
1 parent c71cb29 commit 2dae3c6

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

arch/arm/configs/bcm2709_defconfig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ CONFIG_USB_IRDA=m
360360
CONFIG_SIGMATEL_FIR=m
361361
CONFIG_MCS_FIR=m
362362
CONFIG_BT=m
363-
CONFIG_BT_6LOWPAN=m
364363
CONFIG_BT_RFCOMM=m
365364
CONFIG_BT_RFCOMM_TTY=y
366365
CONFIG_BT_BNEP=m
@@ -563,12 +562,10 @@ CONFIG_BCM_VC_CMA=y
563562
CONFIG_BCM_VC_SM=y
564563
CONFIG_I2C=y
565564
CONFIG_I2C_CHARDEV=m
566-
CONFIG_I2C_MUX=m
567565
CONFIG_I2C_BCM2708=m
568566
CONFIG_SPI=y
569567
CONFIG_SPI_BCM2835=m
570568
CONFIG_SPI_BCM2708=m
571-
CONFIG_SPI_BCM2835=m
572569
CONFIG_SPI_SPIDEV=y
573570
CONFIG_PPS=m
574571
CONFIG_PPS_CLIENT_LDISC=m
@@ -682,7 +679,6 @@ CONFIG_USB_S2255=m
682679
CONFIG_VIDEO_USBTV=m
683680
CONFIG_VIDEO_PVRUSB2=m
684681
CONFIG_VIDEO_HDPVR=m
685-
CONFIG_VIDEO_TLG2300=m
686682
CONFIG_VIDEO_USBVISION=m
687683
CONFIG_VIDEO_STK1160_COMMON=m
688684
CONFIG_VIDEO_STK1160_AC97=y
@@ -1021,8 +1017,8 @@ CONFIG_VT6656=m
10211017
CONFIG_SPEAKUP=m
10221018
CONFIG_SPEAKUP_SYNTH_SOFT=m
10231019
CONFIG_STAGING_MEDIA=y
1020+
CONFIG_VIDEO_TLG2300=m
10241021
CONFIG_LIRC_STAGING=y
1025-
CONFIG_LIRC_IGORPLUGUSB=m
10261022
CONFIG_LIRC_IMON=m
10271023
CONFIG_LIRC_RPI=m
10281024
CONFIG_LIRC_SASEM=m

arch/arm/configs/bcmrpi_defconfig

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,13 @@ CONFIG_USB_IRDA=m
353353
CONFIG_SIGMATEL_FIR=m
354354
CONFIG_MCS_FIR=m
355355
CONFIG_BT=m
356-
CONFIG_BT_6LOWPAN=m
357356
CONFIG_BT_RFCOMM=m
358357
CONFIG_BT_RFCOMM_TTY=y
359358
CONFIG_BT_BNEP=m
360359
CONFIG_BT_BNEP_MC_FILTER=y
361360
CONFIG_BT_BNEP_PROTO_FILTER=y
362361
CONFIG_BT_HIDP=m
362+
CONFIG_BT_6LOWPAN=m
363363
CONFIG_BT_HCIBTUSB=m
364364
CONFIG_BT_HCIBCM203X=m
365365
CONFIG_BT_HCIBPA10X=m
@@ -555,12 +555,10 @@ CONFIG_BCM_VC_CMA=y
555555
CONFIG_BCM_VC_SM=y
556556
CONFIG_I2C=y
557557
CONFIG_I2C_CHARDEV=m
558-
CONFIG_I2C_MUX=m
559558
CONFIG_I2C_BCM2708=m
560559
CONFIG_SPI=y
561560
CONFIG_SPI_BCM2835=m
562561
CONFIG_SPI_BCM2708=m
563-
CONFIG_SPI_BCM2835=m
564562
CONFIG_SPI_SPIDEV=y
565563
CONFIG_PPS=m
566564
CONFIG_PPS_CLIENT_LDISC=m
@@ -674,7 +672,6 @@ CONFIG_USB_S2255=m
674672
CONFIG_VIDEO_USBTV=m
675673
CONFIG_VIDEO_PVRUSB2=m
676674
CONFIG_VIDEO_HDPVR=m
677-
CONFIG_VIDEO_TLG2300=m
678675
CONFIG_VIDEO_USBVISION=m
679676
CONFIG_VIDEO_STK1160_COMMON=m
680677
CONFIG_VIDEO_STK1160_AC97=y
@@ -1013,8 +1010,8 @@ CONFIG_VT6656=m
10131010
CONFIG_SPEAKUP=m
10141011
CONFIG_SPEAKUP_SYNTH_SOFT=m
10151012
CONFIG_STAGING_MEDIA=y
1013+
CONFIG_VIDEO_TLG2300=m
10161014
CONFIG_LIRC_STAGING=y
1017-
CONFIG_LIRC_IGORPLUGUSB=m
10181015
CONFIG_LIRC_IMON=m
10191016
CONFIG_LIRC_RPI=m
10201017
CONFIG_LIRC_SASEM=m

0 commit comments

Comments
 (0)