--- zzzz-none-000/linux-2.6.32.61/init/Kconfig	2013-06-10 09:43:48.000000000 +0000
+++ ar9-7330-650/linux-2.6.32.61/init/Kconfig	2013-05-07 13:46:33.000000000 +0000
@@ -115,10 +115,13 @@
 config HAVE_KERNEL_LZMA
 	bool
 
+config HAVE_KERNEL_LZO
+	bool
+
 choice
 	prompt "Kernel compression mode"
 	default KERNEL_GZIP
-	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
+	depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
 	help
 	  The linux kernel is a kind of self-extracting executable.
 	  Several compression algorithms are available, which differ
@@ -141,9 +144,8 @@
 	bool "Gzip"
 	depends on HAVE_KERNEL_GZIP
 	help
-	  The old and tried gzip compression. Its compression ratio is
-	  the poorest among the 3 choices; however its speed (both
-	  compression and decompression) is the fastest.
+	  The old and tried gzip compression. It provides a good balance
+	  between compression ratio and decompression speed.
 
 config KERNEL_BZIP2
 	bool "Bzip2"
@@ -164,6 +166,14 @@
 	  two. Compression is slowest.	The kernel size is about 33%
 	  smaller with LZMA in comparison to gzip.
 
+config KERNEL_LZO
+	bool "LZO"
+	depends on HAVE_KERNEL_LZO
+	help
+	  Its compression ratio is the poorest among the 4. The kernel
+	  size is about about 10% bigger than gzip; however its speed
+	  (both compression and decompression) is the fastest.
+
 endchoice
 
 config SWAP
@@ -1054,6 +1064,20 @@
 	  Say Y here to enable the extended profiling support mechanisms used
 	  by profilers such as OProfile.
 
+config AVM_SIMPLE_PROFILING
+    bool "Enable AVM Simple Profiling"
+    default n
+
+config AVM_SIMPLE_PROFILING_YIELD
+    bool "Enable AVM Simple Profiling based on yield feature"
+	depends on AVM_SIMPLE_PROFILING && CPU_MIPS_34K
+    default n
+
+config AVM_SIMPLE_PROFILING_YIELD_PCNT
+   bool "yield signal source is the MIPS performance counter, otherwise we use a generic timer"
+   depends on AVM_SIMPLE_PROFILING_YIELD && AR10
+   default y
+
 #
 # Place an empty function call at each tracepoint site. Can be
 # dynamically changed for a probe function.