summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2015-04-16 17:22:40 -0700
committermattis fjallstrom <mattis@acm.org>2015-04-16 17:22:40 -0700
commit0f40d5752c44d0330bd85bc886a0508ab85211d3 (patch)
tree1273e3845d1a83475cbea3cc7d0cde40f5798bc4
parent96f88a5b1f282dea289447f3c5fda50b41313fd5 (diff)
downloadolio-linux-3.10-0f40d5752c44d0330bd85bc886a0508ab85211d3.tar.xz
olio-linux-3.10-0f40d5752c44d0330bd85bc886a0508ab85211d3.zip
Modifications to a) allow device tree and Android to co-exist, and b) add more power management functionality.
Change-Id: I30894578eba94c26afaa01ea6e00ded1c43610c6
-rw-r--r--arch/arm/configs/omap3_h1_defconfig21
1 files changed, 11 insertions, 10 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig
index c480a53bd9a..bc80789315e 100644
--- a/arch/arm/configs/omap3_h1_defconfig
+++ b/arch/arm/configs/omap3_h1_defconfig
@@ -990,7 +990,7 @@ CONFIG_MTD=y
# CONFIG_MTD_REDBOOT_PARTS is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_OF_PARTS is not set
# CONFIG_MTD_AR7_PARTS is not set
#
@@ -2512,7 +2512,14 @@ CONFIG_IRQCHIP=y
CONFIG_DCACHE_WORD_ACCESS=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_XFS_FS is not set
@@ -2525,14 +2532,8 @@ CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
# CONFIG_AUTOFS4_FS is not set
CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set