From d1bd327236b0971cd423b3dbd8fc991bdf048d8e Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Tue, 28 Sep 2010 19:07:28 +0000
Subject: [PATCH] --- yaml --- r: 216940 b: refs/heads/master c:
 7ad0e386d46e9edff64705ab25337ad9130baf63 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/configs/omap2plus_defconfig | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index adf5aa3df699..0c655a87b85c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecfdd76d2ffe76687385294619f6576aa4338c4e
+refs/heads/master: 7ad0e386d46e9edff64705ab25337ad9130baf63
diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig
index cb5f7f929f7d..7deec89872c7 100644
--- a/trunk/arch/arm/configs/omap2plus_defconfig
+++ b/trunk/arch/arm/configs/omap2plus_defconfig
@@ -65,10 +65,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyS2,115200"
 CONFIG_KEXEC=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NEON=y