Skip to content

Commit

Permalink
Merge tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mv…
Browse files Browse the repository at this point in the history
…ebu into next/defconfig

Merge "ARM: mvebu: defconfig changes for v4.1 (round 2)" from Gregory Clement:

mvebu defconfig changes for v4.1 (part #2)

- add perf support in mvebu_v7_defconfig

* tag 'mvebu-defconfig-4.1-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable perf support in mvebu_v7_defconfig

Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
olofj committed Apr 3, 2015
2 parents cef9f50 + 76b21e3 commit f28ae3b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/configs/mvebu_v7_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y
CONFIG_EXPERT=y
CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
Expand Down

0 comments on commit f28ae3b

Please sign in to comment.