aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2010-12-03 09:35:26 -0700
committerJohn Rigby <john.rigby@linaro.org>2010-12-03 09:35:26 -0700
commitb63fd1d186295f1e451601584e2d75152480e20e (patch)
treedbc0143fe66671606defd5584c2e7bbf47dd9143
parent76bf744ee2a11c8c3402129859d2d95e4e7e51ec (diff)
LINARO: [CONFIG] Enable CONFIG_PERF_EVENTS for all flavours
BugLink: http://bugs/launchpad.net/bugs/683195 Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx511
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap1
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress1
-rw-r--r--debian.linaro/config/config.common.ubuntu1
4 files changed, 1 insertions, 3 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index ed25c85c080..21539e6dab4 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -363,7 +363,6 @@ CONFIG_NO_HZ=y
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARTITION_ADVANCED is not set
# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
# CONFIG_PHONE is not set
# CONFIG_PHONET is not set
# CONFIG_PID_NS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 7211bab111d..be3602da83d 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -380,7 +380,6 @@ CONFIG_OMFS_FS=m
CONFIG_PANTHERLORD_FF=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_PERF_COUNTERS=y
-CONFIG_PERF_EVENTS=y
CONFIG_PHONE=m
CONFIG_PHONET=m
CONFIG_PID_NS=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index c9134d259f3..affd208b747 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -378,7 +378,6 @@ CONFIG_OABI_COMPAT=y
# CONFIG_PANTHERLORD_FF is not set
# CONFIG_PARTITION_ADVANCED is not set
# CONFIG_PERF_COUNTERS is not set
-# CONFIG_PERF_EVENTS is not set
# CONFIG_PHONE is not set
# CONFIG_PHONET is not set
# CONFIG_PID_NS is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 3fddc2379c5..bf3f24f613b 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -1778,6 +1778,7 @@ CONFIG_PCF50633_ADC=m
CONFIG_PCF50633_GPIO=m
# CONFIG_PCI_SYSCALL is not set
CONFIG_PDA_POWER=m
+CONFIG_PERF_EVENTS=y
CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y
# CONFIG_PHYS_ADDR_T_64BIT is not set