--- 7efd3a9d0554ddbee2d173236f4cb5f9e54fe5e2
+++ 9cd024fea297b51f6a35a2dec6ecbd8e3dbb5169
@@ -15,17 +15,6 @@ config CPU_FREQ
 
 if CPU_FREQ
 
-config CPU_FREQ_MIN_FREQ
-	int "Minimum CPU Frequency"
-	default 245000
-
-config CPU_FREQ_MAX_FREQ
-	int "Maximum CPU Frequency"
-	default 998400
-	help
-	  WARNING: Since not all devices are made equal, do not set this higher
-	  than the stock frequency.
-
 config CPU_FREQ_TABLE
 	tristate
 
@@ -129,22 +118,7 @@ config CPU_FREQ_DEFAULT_GOV_INTERACTIVE
 	 Use the 'interactive' governor as default. This gets full cpu frequency
 	 scaling for workloads that are latency sensitive, typically interactive
 	 workloads..
-config CPU_FREQ_DEFAULT_GOV_SMARTASS
-  bool "smartass"
-  select CPU_FREQ_GOV_SMARTASS
-  select CPU_FREQ_GOV_PERFORMANCE
-  help
-    Use the CPUFreq governor 'smartass' as default.
-
- endchoice
- 
-config CPU_FREQ_GOV_SMARTASS
-  tristate "'smartass' cpufreq governor"
-  depends on CPU_FREQ
-  help
-    'smartass' - a "smart" optimized governor for the hero!
-
-    If in doubt, say N.
+endchoice
 
 config CPU_FREQ_GOV_PERFORMANCE
 	tristate "'performance' governor"
@@ -231,20 +205,4 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 	  If in doubt, say N.
 
-config CPU_FREQ_VDD_LEVELS
-	bool "CPU Vdd levels sysfs interface"
-	depends on CPU_FREQ_STAT
-	depends on ARCH_QSD8X50
-	default n
-	help
-	  CPU Vdd levels sysfs interface
-
-config CPU_FREQ_VDD_LEVELS_MIN
-	int "Min VDD Level"
-	default 1000
-
-config CPU_FREQ_VDD_LEVELS_MAX
-	int "Max VDD Level"
-	default 1300
-
 endif	# CPU_FREQ