aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux/linux-nokia900-meego
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/linux/linux-nokia900-meego')
-rw-r--r--recipes/linux/linux-nokia900-meego/defconfig14
1 files changed, 9 insertions, 5 deletions
diff --git a/recipes/linux/linux-nokia900-meego/defconfig b/recipes/linux/linux-nokia900-meego/defconfig
index 076a53977b..64ad739153 100644
--- a/recipes/linux/linux-nokia900-meego/defconfig
+++ b/recipes/linux/linux-nokia900-meego/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.37 Kernel Configuration
-# Mon Mar 28 01:27:15 2011
+# Thu Apr 28 17:40:42 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -275,6 +275,7 @@ CONFIG_ARCH_OMAP2PLUS=y
#
# OMAP Feature Selections
#
+# CONFIG_OMAP_SMARTREFLEX is not set
CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX=y
# CONFIG_OMAP_MUX_DEBUG is not set
@@ -481,6 +482,8 @@ CONFIG_SUSPEND_FREEZER=y
# CONFIG_APM_EMULATION is not set
CONFIG_PM_RUNTIME=y
CONFIG_PM_OPS=y
+CONFIG_ARCH_HAS_OPP=y
+CONFIG_PM_OPP=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -1211,10 +1214,14 @@ CONFIG_POWER_SUPPLY=m
# CONFIG_TEST_POWER is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_BQ20Z75 is not set
-# CONFIG_BATTERY_BQ27x00 is not set
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+# CONFIG_BATTERY_BQ27X00_PLATFORM is not set
# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
CONFIG_CHARGER_ISP1704=m
# CONFIG_CHARGER_TWL4030 is not set
+# CONFIG_CHARGER_GPIO is not set
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1530,9 +1537,6 @@ CONFIG_RADIO_SI4713=m
#
# CONFIG_DRM is not set
# CONFIG_PVR is not set
-# CONFIG_PVR_RELEASE is not set
-# CONFIG_PVR_DEBUG is not set
-# CONFIG_PVR_TIMING is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y