diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 17:44:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 17:44:13 -0400 |
commit | 930b440cd8256f3861bdb0a59d26efaadac7941a (patch) | |
tree | 145ac54e152834fed7bce78b3eb33e8ea4d90226 /arch/arm/configs/kzm9g_defconfig | |
parent | ff050ad12c551233e546506409c89eb2f640d9f3 (diff) | |
parent | 077492acceeafc0a106f88b0780623d2321a8947 (diff) |
Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board changes from Arnd Bergmann:
"As we continue to replace board files with device tree descriptions,
this part of the ARM support is getting smaller. We have basically
just defconfig changes here this time, and a significant number of
Renesas shmobile changes, as Renesas is still in the process of
deprecating board file support"
* tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
ARM: enable fhandle in multi_v7_defconfig
ARM: tegra: enable fhandle in tegra_defconfig
ARM: update multi_v7_defconfig for Tegra
ARM: add Marvell Dove and some drivers to multi_v7 defconfig
ARM: fix duplicate symbols in multi_v5_defconfig
ARM: pxa: add gpio keys information
ARM: tegra: defconfig updates
ARM: config: keystone: enable AEMIF/NAND support
ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig
ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
ARM: config: Add mvebu_v5_defconfig
ARM: config: Add a multi_v5_defconfig
ARM: shmobile: r7s72100: update defconfig for I2C usage
ARM: shmobile: Remove Lager DT reference legacy clock bits
ARM: shmobile: Remove Koelsch DT reference legacy clock bits
ARM: shmobile: Remove KZM9D board code
ARM: mvebu: update defconfigs for Armada 375 and 38x
ARM: dove: Enable watchdog support in the defconfig
ARM: mvebu: Enable watchdog support in defconfig
ARM: config: keystone: enable led support
...
Diffstat (limited to 'arch/arm/configs/kzm9g_defconfig')
-rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 9934dbc23d64..12bd1f63c399 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig | |||
@@ -60,6 +60,8 @@ CONFIG_IRDA=y | |||
60 | CONFIG_SH_IRDA=y | 60 | CONFIG_SH_IRDA=y |
61 | # CONFIG_WIRELESS is not set | 61 | # CONFIG_WIRELESS is not set |
62 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 62 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
63 | CONFIG_DEVTMPFS=y | ||
64 | CONFIG_DEVTMPFS_MOUNT=y | ||
63 | CONFIG_SCSI=y | 65 | CONFIG_SCSI=y |
64 | CONFIG_BLK_DEV_SD=y | 66 | CONFIG_BLK_DEV_SD=y |
65 | CONFIG_NETDEVICES=y | 67 | CONFIG_NETDEVICES=y |