diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-23 19:20:34 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-23 19:20:34 +0200 |
| commit | 57dbe1baaceacb034b4c00050f04c1a3b726e9c7 (patch) | |
| tree | c9da9ced6c74118d999adb57ec387d94c5a92da8 /arch/arm | |
| parent | Merge tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu into ne... (diff) | |
| parent | ARM: sunxi_defconfig: enable MODULE_UNLOAD (diff) | |
| download | linux-57dbe1baaceacb034b4c00050f04c1a3b726e9c7.tar.xz linux-57dbe1baaceacb034b4c00050f04c1a3b726e9c7.zip | |
Merge tag 'sunxi-defconfig-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig
Allwinner defconfig changes for 4.4
A bunch of defconfig changes to enable support for new drivers.
* tag 'sunxi-defconfig-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi_defconfig: enable MODULE_UNLOAD
can: Allwinner A10/A20 CAN Controller support - Defconfig
can: Allwinner A10/A20 CAN Controller support - Defconfig
ARM: sunxi_defconfig: Enable LRADC keys (KEYBOARD_SUN4I_LRADC)
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index d3fc04007cf5..25e403dda2bb 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -153,6 +153,7 @@ CONFIG_CAN_DEV=y CONFIG_CAN_AT91=m CONFIG_CAN_XILINXCAN=y CONFIG_CAN_MCP251X=y +CONFIG_CAN_SUN4I=y CONFIG_BT=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 51eea220baae..3c36e16fcacf 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -5,6 +5,7 @@ CONFIG_CGROUPS=y CONFIG_BLK_DEV_INITRD=y CONFIG_PERF_EVENTS=y CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_SUNXI=y CONFIG_SMP=y CONFIG_NR_CPUS=8 @@ -31,6 +32,8 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set +CONFIG_CAN=y +CONFIG_CAN_SUN4I=y # CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y @@ -63,6 +66,7 @@ CONFIG_STMMAC_ETH=y CONFIG_INPUT_MISC=y CONFIG_INPUT_AXP20X_PEK=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_KEYBOARD_SUN4I_LRADC=y CONFIG_TOUCHSCREEN_SUN4I=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y |