From: Victor Martinez <pitillo@ono.com>
Date: Wed, 10 Feb 2010 14:27:57 +0000 (+0000)
Subject: Removed android options.
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=9bb8d4bb5d9722aec9d264da50be9c43a35143a3;p=kernel%2Fomap850.git

Removed android options.
---

diff --git a/config-2.6.25-omap850 b/config-2.6.25-omap850
index cc8232c..ec952de 100644
--- a/config-2.6.25-omap850
+++ b/config-2.6.25-omap850
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25-omap1
-# Tue Feb  9 19:00:41 2010
+# Wed Feb 10 14:27:13 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -473,9 +473,9 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_MISC_DEVICES=y
-CONFIG_ANDROID_PMEM=y
+# CONFIG_ANDROID_PMEM is not set
 CONFIG_TIMED_OUTPUT=y
-CONFIG_TIMED_GPIO=y
+# CONFIG_TIMED_GPIO is not set
 CONFIG_BINDER_IPC=y
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
@@ -948,13 +948,11 @@ CONFIG_RTC_DRV_OMAP=y
 #
 # Android
 #
-CONFIG_ANDROID_POWER=y
-# CONFIG_ANDROID_POWER_ALARM is not set
-# CONFIG_ANDROID_POWER_STAT is not set
+# CONFIG_ANDROID_POWER is not set
 # CONFIG_ANDROID_LOGGER is not set
 # CONFIG_ANDROID_TIMED_GPIO is not set
 # CONFIG_ANDROID_BINDER_IPC is not set
-CONFIG_ANDROID_PARANOID_NETWORK=y
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 
 #
 # CBUS support