diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
| commit | 9811283a233b55428a99771f803d2ca0f80d29de (patch) | |
| tree | f41b7c5958f865c1015c3e2f29f0ffdfccdc78e6 /arch/arm/configs/gta02_packaging_defconfig | |
| parent | dd6196f5cc0cd707e7f694f52d7e847e066a1967 (diff) | |
| parent | b90406de472c1aa5371ab593a2bb79136d5de658 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Diffstat (limited to 'arch/arm/configs/gta02_packaging_defconfig')
| -rw-r--r-- | arch/arm/configs/gta02_packaging_defconfig | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig index 03c72d5652b..e2dbbef7b44 100644 --- a/arch/arm/configs/gta02_packaging_defconfig +++ b/arch/arm/configs/gta02_packaging_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc3 -# Sun Apr 19 22:57:25 2009 +# Fri Oct 2 20:51:57 2009 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -1785,17 +1785,14 @@ CONFIG_STAGING=y # # 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 is not set +# CONFIG_ANDROID_BINDER_IPC is not set +# CONFIG_ANDROID_LOGGER is not set +# CONFIG_ANDROID_RAM_CONSOLE is not set +# CONFIG_ANDROID_TIMED_GPIO is not set +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set # CONFIG_ANDROID_WAKELOCK is not set -CONFIG_ANDROID_PARANOID_NETWORK=y +# CONFIG_ANDROID_PARANOID_NETWORK is not set # # File systems |