Merge pull request #4239 from MilhouseVH/kernel-412

[RPi]: Enable config options required for next RPi kernel bump
This commit is contained in:
Stephan Raue 2015-07-22 11:07:26 +02:00
commit e1e91a5174
2 changed files with 12 additions and 2 deletions

View File

@ -1289,6 +1289,7 @@ CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_XPAD=m
CONFIG_JOYSTICK_XPAD_FF=y
CONFIG_JOYSTICK_XPAD_LEDS=y
# CONFIG_JOYSTICK_RPISENSE is not set
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
@ -1381,6 +1382,7 @@ CONFIG_HW_RANDOM_BCM2708=m
CONFIG_BRCM_CHAR_DRIVERS=y
CONFIG_BCM_VC_CMA=y
CONFIG_BCM2708_VCMEM=y
CONFIG_BCM_VCIO=y
CONFIG_BCM_VC_SM=y
# CONFIG_XILLYBUS is not set
@ -1782,6 +1784,7 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
# Multifunction device drivers
#
CONFIG_MFD_CORE=y
# CONFIG_MFD_RPISENSE_CORE is not set
# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_PMIC_ADP5520 is not set
@ -2305,6 +2308,7 @@ CONFIG_FB_BCM2708=y
# CONFIG_FB_AUO_K190X is not set
# CONFIG_FB_SIMPLE is not set
# CONFIG_FB_SSD1307 is not set
# CONFIG_FB_RPISENSE is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_VGASTATE is not set
@ -3018,6 +3022,7 @@ CONFIG_BCM2708_MBOX=y
# CONFIG_ARM_MHU is not set
# CONFIG_PL320_MBOX is not set
# CONFIG_ALTERA_MBOX is not set
CONFIG_BCM2835_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set
#
@ -3032,7 +3037,6 @@ CONFIG_BCM2708_MBOX=y
#
# SOC (System On Chip) specific Drivers
#
CONFIG_BCM2708_POWER=y
# CONFIG_SOC_TI is not set
# CONFIG_PM_DEVFREQ is not set
CONFIG_EXTCON=m
@ -3070,6 +3074,7 @@ CONFIG_IRQCHIP=y
# Firmware Drivers
#
# CONFIG_FIRMWARE_MEMMAP is not set
CONFIG_RASPBERRYPI_FIRMWARE=y
#
# File systems

View File

@ -1341,6 +1341,7 @@ CONFIG_INPUT_JOYSTICK=y
CONFIG_JOYSTICK_XPAD=m
CONFIG_JOYSTICK_XPAD_FF=y
CONFIG_JOYSTICK_XPAD_LEDS=y
# CONFIG_JOYSTICK_RPISENSE is not set
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
@ -1433,6 +1434,7 @@ CONFIG_HW_RANDOM_BCM2708=m
CONFIG_BRCM_CHAR_DRIVERS=y
CONFIG_BCM_VC_CMA=y
CONFIG_BCM2708_VCMEM=y
CONFIG_BCM_VCIO=y
CONFIG_BCM_VC_SM=y
# CONFIG_XILLYBUS is not set
@ -1834,6 +1836,7 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
# Multifunction device drivers
#
CONFIG_MFD_CORE=y
# CONFIG_MFD_RPISENSE_CORE is not set
# CONFIG_MFD_AS3711 is not set
# CONFIG_MFD_AS3722 is not set
# CONFIG_PMIC_ADP5520 is not set
@ -2357,6 +2360,7 @@ CONFIG_FB_BCM2708=y
# CONFIG_FB_AUO_K190X is not set
# CONFIG_FB_SIMPLE is not set
# CONFIG_FB_SSD1307 is not set
# CONFIG_FB_RPISENSE is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# CONFIG_VGASTATE is not set
@ -3073,6 +3077,7 @@ CONFIG_BCM2708_MBOX=y
# CONFIG_ARM_MHU is not set
# CONFIG_PL320_MBOX is not set
# CONFIG_ALTERA_MBOX is not set
CONFIG_BCM2835_MBOX=y
# CONFIG_IOMMU_SUPPORT is not set
#
@ -3087,7 +3092,6 @@ CONFIG_BCM2708_MBOX=y
#
# SOC (System On Chip) specific Drivers
#
CONFIG_BCM2708_POWER=y
# CONFIG_SOC_TI is not set
# CONFIG_PM_DEVFREQ is not set
CONFIG_EXTCON=m
@ -3125,6 +3129,7 @@ CONFIG_IRQCHIP=y
# Firmware Drivers
#
# CONFIG_FIRMWARE_MEMMAP is not set
CONFIG_RASPBERRYPI_FIRMWARE=y
#
# File systems