diff --git a/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits.c b/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits.c
index 4e755117..95985c0b 100755
--- a/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits.c
+++ b/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits.c
@@ -272,9 +272,7 @@ NvRmPrivClockLimitsInit(NvRmDeviceHandle hRmDevice)
     // Combine AVP/System clock absolute limit with scaling V/F ladder upper
     // boundary, and set default clock range for all present modules the same
     // as for AVP/System clock
-#ifdef CONFIG_AVP_OVERCLOCK
-    AvpMaxKHz = 266400;
-#else
+
     AvpMaxKHz = pSKUedLimits->AvpMaxKHz;
     for (i = 0; i < pShmoo->ScaledLimitsListSize; i++)
     {
@@ -285,7 +283,7 @@ NvRmPrivClockLimitsInit(NvRmDeviceHandle hRmDevice)
             break;
         }
     }
-#endif //CONFIG_AVP_OVERCLOCK
+
     for (i = 0; i < NvRmPrivModuleID_Num; i++)
     {
         NvRmModuleInstance *inst;
diff --git a/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits1300.c b/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits1300.c
index 4a7c86d6..a2adadc7 100755
--- a/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits1300.c
+++ b/arch/arm/mach-tegra/nvrm/core/common/nvrm_clocks_limits1300.c
@@ -272,9 +272,7 @@ NvRmPrivClockLimitsInit(NvRmDeviceHandle hRmDevice)
     // Combine AVP/System clock absolute limit with scaling V/F ladder upper
     // boundary, and set default clock range for all present modules the same
     // as for AVP/System clock
-#ifdef CONFIG_AVP_OVERCLOCK
-    AvpMaxKHz = 266400;
-#else
+
     AvpMaxKHz = pSKUedLimits->AvpMaxKHz;
     for (i = 0; i < pShmoo->ScaledLimitsListSize; i++)
     {
@@ -285,7 +283,7 @@ NvRmPrivClockLimitsInit(NvRmDeviceHandle hRmDevice)
             break;
         }
     }
-#endif //CONFIG_AVP_OVERCLOCK
+
     for (i = 0; i < NvRmPrivModuleID_Num; i++)
     {
         NvRmModuleInstance *inst;
diff --git a/arch/arm/mach-tegra/odm_kit/Kconfig b/arch/arm/mach-tegra/odm_kit/Kconfig
index 8181bdf4..c6b02a1e 100644
--- a/arch/arm/mach-tegra/odm_kit/Kconfig
+++ b/arch/arm/mach-tegra/odm_kit/Kconfig
@@ -28,10 +28,6 @@ config TEGRA_ODM_DAYTONA
 config TEGRA_ODM_OLYMPUS
 	bool "Motorola OLYMPUS brassboard/phone"
 	depends on ARCH_TEGRA_2x_SOC
-config AVP_OVERCLOCK
-	bool "AVP Overclocking"
-	depends on ARCH_TEGRA
-	default n
 
 config STOCK_VOLTAGE
 	bool "stock voltage values"
diff --git a/include/linux/qtouch_obp_ts.h b/include/linux/qtouch_obp_ts.h
index 34b8a33c..aea19775 100644
--- a/include/linux/qtouch_obp_ts.h
+++ b/include/linux/qtouch_obp_ts.h
@@ -702,7 +702,7 @@ struct qtouch_ts_platform_data
 enum 
 {
 /* Implemented */
-	QTOUCH_IOCTL_SET_DEBUG		= 1,
+	QTOUCH_IOCTL_SET_DEBUG		= 0,
 	QTOUCH_IOCTL_GET_DEBUG,
 	QTOUCH_IOCTL_GET_VERSION,
 	QTOUCH_IOCTL_MODE,