From fb643804798c3a69408a4d9ac5e50b5277383abf Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Wed, 28 Jul 2010 18:06:59 -0700 Subject: [PATCH] [ARM] configs: Add ov5650 to stingray defconfig Change-Id: Id0088aff7dc4f235965d834e153461f653772300 Signed-off-by: Rebecca Schultz Zavin --- arch/arm/configs/stingray_defconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/configs/stingray_defconfig b/arch/arm/configs/stingray_defconfig index c1e0580ce870..acc7da9a24ca 100644 --- a/arch/arm/configs/stingray_defconfig +++ b/arch/arm/configs/stingray_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.35-rc3 -# Thu Jul 22 13:49:10 2010 +# Linux kernel version: 2.6.35-rc6 +# Wed Jul 28 18:06:43 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -436,6 +436,7 @@ CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP_SMP=y CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_NVS=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_HAS_WAKELOCK=y @@ -901,18 +902,15 @@ CONFIG_KERNEL_DEBUGGER_CORE=y CONFIG_MDM6600_CTRL=y # CONFIG_ISL29003 is not set # CONFIG_SENSORS_TSL2550 is not set -# CONFIG_SENSORS_AKM8973 is not set -# CONFIG_SENSORS_AKM8973_AKMD is not set CONFIG_SENSORS_AK8975=y CONFIG_SENSORS_BMP085=y CONFIG_SENSORS_KXTF9=y -# CONFIG_SENSORS_LIS331DLH is not set CONFIG_SENSORS_L3G4200D=y CONFIG_SENSORS_MAX9635=y -# CONFIG_WL127X_RFKILL is not set # CONFIG_DS1682 is not set # CONFIG_TI_DAC7512 is not set CONFIG_UID_STAT=y +# CONFIG_WL127X_RFKILL is not set CONFIG_APANIC=y CONFIG_APANIC_PLABEL="crashdata" CONFIG_GPS_GPIO_BRCM4750=y @@ -1473,6 +1471,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set +CONFIG_VIDEO_OV5650=y # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_SOC_CAMERA is not set @@ -1735,6 +1734,7 @@ CONFIG_USB_SERIAL=y # CONFIG_USB_SERIAL_MOS7840 is not set # CONFIG_USB_SERIAL_MOTOROLA is not set CONFIG_USB_MDM6600_CDMA_MODEM=y +# CONFIG_USB_SERIAL_MOTO_FLASH_MODEM is not set # CONFIG_USB_SERIAL_NAVMAN is not set # CONFIG_USB_SERIAL_PL2303 is not set # CONFIG_USB_SERIAL_OTI6858 is not set -- 2.34.1