From 227ee5a3af08f060b4ef66d274fdc2bcf4124fb0 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Fri, 30 Oct 2009 08:31:01 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/config/config: Enable
 PERF_EVENTS and EVENT_PROFILE. * debian/config/kernelarch-x86/config: Remove
 old option.

svn path=/dists/trunk/linux-2.6/; revision=14511
---
 debian/changelog                    | 1 +
 debian/config/config                | 4 ++++
 debian/config/kernelarch-x86/config | 5 -----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f0ee6b6e..bb8daf3da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low
   [ Bastian Blank ]
   * [mips] Don't force EMBEDDED on.
   * [sparc] Don't builtin Ext2 support.
+  * Enable PERF_EVENTS, EVENT_PROFILE.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 26 Oct 2009 01:18:26 +0000
 
diff --git a/debian/config/config b/debian/config/config
index ffcc1861b..2edc09599 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2958,6 +2958,10 @@ CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_PERF_EVENTS=y
+CONFIG_EVENT_PROFILE=y
+#. Compatibility setting
+# CONFIG_PERF_COUNTERS is not set
 CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_COMPAT_BRK is not set
 ## choice: Choose SLAB allocator
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 3c22c75cb..001637c56 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1324,11 +1324,6 @@ CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_EFI_PARTITION=y
 
-##
-## file: init/Kconfig
-##
-CONFIG_PERF_COUNTERS=y
-
 ##
 ## file: kernel/trace/Kconfig
 ##