+diff -Nurb linux-2.6.22-580/arch/i386/Kconfig linux-2.6.22-590/arch/i386/Kconfig
+--- linux-2.6.22-580/arch/i386/Kconfig 2008-02-27 14:59:40.000000000 -0500
++++ linux-2.6.22-590/arch/i386/Kconfig 2008-02-28 07:55:57.000000000 -0500
+@@ -1217,6 +1217,14 @@
+
+ source "arch/i386/oprofile/Kconfig"
+
++config CHOPSTIX
++ bool "Chopstix (PlanetLab)"
++ depends on MODULES && OPROFILE
++ help
++ Chopstix allows you to monitor various events by summarizing them
++ in lossy data structures and transferring these data structures
++ into user space. If in doubt, say "N".
++
+ config KPROBES
+ bool "Kprobes (EXPERIMENTAL)"
+ depends on KALLSYMS && EXPERIMENTAL && MODULES