diff options
| author | Simon Horman <horms@verge.net.au> | 2012-11-08 09:49:35 +0100 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-11-08 09:49:35 +0100 |
| commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch) | |
| tree | 4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/configs | |
| parent | ARM: shmobile: Remove G4EVM machine support (diff) | |
| parent | ARM: shmobile: add fsi external clock sh7372 (diff) | |
| download | linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.tar.xz linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.zip | |
Merge branch 'soc' into boards
Conflicts:
arch/arm/configs/marzen_defconfig
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index f78d259f8d23..3d764072dd54 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -7,6 +7,7 @@ CONFIG_LOG_BUF_SHIFT=16 # CONFIG_IPC_NS is not set # CONFIG_PID_NS is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y |