* 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

@@ -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
 

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

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
 ##