Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5342a1ab3d
|
@ -33,6 +33,8 @@ linux (4.4~rc7-1~exp1) UNRELEASED; urgency=medium
|
|||
- Enable DRM_VC4, I2C_BCM2835, MMC_SDHCI_BCM2835, PWM_BCM2835, SPI_BCM2835,
|
||||
SPI_BCM2835AUX, USB_DWC2, BCM2835_WDT, SND_BCM2835_SOC_I2S as modules
|
||||
- udeb: Add sdhci-bcm2835 to mmc-modules, dwc2 to usb-modules
|
||||
* [armhf] Enable INPUT_AXP20X_PEK, CAN_SUN4I, SND_SUN4I_CODEC as modules
|
||||
(Closes: #808623)
|
||||
|
||||
[ Ian Campbell ]
|
||||
* [armel/kirkwood] Updates/clarifications to kernel size limitations from
|
||||
|
|
|
@ -376,6 +376,7 @@ CONFIG_KEYBOARD_TWL4030=m
|
|||
## file: drivers/input/misc/Kconfig
|
||||
##
|
||||
CONFIG_INPUT_MMA8450=m
|
||||
CONFIG_INPUT_AXP20X_PEK=m
|
||||
CONFIG_INPUT_TWL4030_PWRBUTTON=m
|
||||
CONFIG_INPUT_TWL4030_VIBRA=m
|
||||
CONFIG_INPUT_TWL6040_VIBRA=m
|
||||
|
@ -543,6 +544,11 @@ CONFIG_MTD_NAND_SUNXI=m
|
|||
CONFIG_MTD_ONENAND=y
|
||||
CONFIG_MTD_ONENAND_OMAP2=m
|
||||
|
||||
##
|
||||
## file: drivers/net/can/Kconfig
|
||||
##
|
||||
CONFIG_CAN_SUN4I=m
|
||||
|
||||
##
|
||||
## file: drivers/net/ethernet/Kconfig
|
||||
##
|
||||
|
@ -1140,6 +1146,11 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
|
|||
CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
|
||||
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
|
||||
|
||||
##
|
||||
## file: sound/soc/sunxi/Kconfig
|
||||
##
|
||||
CONFIG_SND_SUN4I_CODEC=m
|
||||
|
||||
##
|
||||
## file: sound/soc/tegra/Kconfig
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue