config-gta02-staging-and-new-android.patch

Signed-off-by: Andy Green <andy@openmoko.com>

2 files changed, 65 insertions, 29 deletions

diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
index a5b25a5f9de..78541830522 100644
--- a/arch/arm/configs/gta02-moredrivers-defconfig
+++ b/arch/arm/configs/gta02-moredrivers-defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-rc2
-# Wed Jan 28 20:05:05 2009
+# Thu Jan 29 13:44:26 2009
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -819,7 +819,6 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_MISC_DEVICES=y
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_ICS932S401 is not set
-CONFIG_LOW_MEMORY_KILLER=y
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_C2PORT is not set
 CONFIG_HAVE_IDE=y
@@ -1750,18 +1749,6 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
-
-#
-# Android
-#
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_POWER=y
-CONFIG_ANDROID_POWER_STAT=y
-CONFIG_ANDROID_POWER_ALARM=y
-CONFIG_ANDROID_LOGGER=y
-# CONFIG_ANDROID_RAM_CONSOLE is not set
-# CONFIG_ANDROID_TIMED_GPIO is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -1773,7 +1760,38 @@ CONFIG_UIO_PDRV=y
 # CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_SMX is not set
 # CONFIG_UIO_SERCOS3 is not set
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_MEILHAUS is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_ECHO is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_INPUT_MIMIO is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_LOGGER=y
+CONFIG_ANDROID_RAM_CONSOLE=y
+CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
+# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
+# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
+CONFIG_ANDROID_TIMED_GPIO=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ANDROID_HAS_WAKELOCK=y
+CONFIG_ANDROID_HAS_EARLYSUSPEND=y
+CONFIG_ANDROID_WAKELOCK=y
+CONFIG_ANDROID_USER_WAKELOCK=y
+CONFIG_ANDROID_EARLYSUSPEND=y
+# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
+CONFIG_ANDROID_CONSOLE_EARLYSUSPEND=y
+# CONFIG_ANDROID_FB_EARLYSUSPEND is not set
+CONFIG_ANDROID_POWER_ALARM=y
+CONFIG_ANDROID_PARANOID_NETWORK=y
 
 #
 # File systems
diff --git a/arch/arm/configs/gta02-packaging-defconfig b/arch/arm/configs/gta02-packaging-defconfig
index 6780bdb85da..50efc1ec874 100644
--- a/arch/arm/configs/gta02-packaging-defconfig
+++ b/arch/arm/configs/gta02-packaging-defconfig
@@ -819,7 +819,6 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_MISC_DEVICES=y
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_ICS932S401 is not set
-CONFIG_LOW_MEMORY_KILLER=y
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_C2PORT is not set
 CONFIG_HAVE_IDE=y
@@ -1750,18 +1749,6 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
-
-#
-# Android
-#
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_POWER=y
-CONFIG_ANDROID_POWER_STAT=y
-CONFIG_ANDROID_POWER_ALARM=y
-CONFIG_ANDROID_LOGGER=y
-# CONFIG_ANDROID_RAM_CONSOLE is not set
-# CONFIG_ANDROID_TIMED_GPIO is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
@@ -1773,7 +1760,38 @@ CONFIG_UIO_PDRV=y
 # CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_SMX is not set
 # CONFIG_UIO_SERCOS3 is not set
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+# CONFIG_MEILHAUS is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_ECHO is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_INPUT_MIMIO is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_LOGGER=y
+CONFIG_ANDROID_RAM_CONSOLE=y
+CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
+# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
+# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
+CONFIG_ANDROID_TIMED_GPIO=y
+CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+CONFIG_ANDROID_HAS_WAKELOCK=y
+CONFIG_ANDROID_HAS_EARLYSUSPEND=y
+CONFIG_ANDROID_WAKELOCK=y
+CONFIG_ANDROID_USER_WAKELOCK=y
+CONFIG_ANDROID_EARLYSUSPEND=y
+# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
+CONFIG_ANDROID_CONSOLE_EARLYSUSPEND=y
+# CONFIG_ANDROID_FB_EARLYSUSPEND is not set
+CONFIG_ANDROID_POWER_ALARM=y
+CONFIG_ANDROID_PARANOID_NETWORK=y
 
 #
 # File systems