diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-11 23:04:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-11 23:04:30 -0700 |
| commit | e5567598c61907187261aba7095ac825d8060827 (patch) | |
| tree | 47395e02cc501f374b77749500dfe31fb772d09b /arch/arm/configs | |
| parent | 8b60d520c307437f497d7a579d349d5488abf782 (diff) | |
| parent | e433d4440bf7dd5955a4616cfb9bffd1ec6ab839 (diff) | |
Merge branch 'renesas/pmu' into next/soc
* renesas/pmu:
ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/kzm9d_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig index 26146ffea1a5..8c49df66cac3 100644 --- a/arch/arm/configs/kzm9d_defconfig +++ b/arch/arm/configs/kzm9d_defconfig @@ -8,6 +8,7 @@ CONFIG_LOG_BUF_SHIFT=16 CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y +CONFIG_PERF_EVENTS=y CONFIG_SLAB=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 2388c8610627..5d0c66708960 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -14,6 +14,7 @@ CONFIG_NAMESPACES=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y +CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y |