diff options
| author | Mathieu J. Poirier <mathieu.poirier@peartreecs.com> | 2011-09-18 11:59:16 -0600 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-09-18 11:59:16 -0600 |
| commit | 60be6336a50c407641cc5c7762458d0a9a0c0c7c (patch) | |
| tree | 1bad0d02b56df44d112b89245378102bf30aeed1 | |
| parent | aa8366e08836ece21fe8dcee87f6065ca7cb9d1c (diff) | |
Disabling omap console for proper output through serial console
and enabling btrfs.
Signed-off-by: Mathieu J. Poirier <mathieu.poirier@peartreecs.com>
| -rw-r--r-- | arch/arm/configs/meego_n9xx_defconfig | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/arch/arm/configs/meego_n9xx_defconfig b/arch/arm/configs/meego_n9xx_defconfig index 8f07a3f4e81..a9930cb5df8 100644 --- a/arch/arm/configs/meego_n9xx_defconfig +++ b/arch/arm/configs/meego_n9xx_defconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/arm 3.0.0 Kernel Configuration +# Linux/arm 3.0.4 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -33,6 +33,7 @@ CONFIG_IRQ_WORK=y # CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 +# CONFIG_INIT_PASS_ALL_PARAMS is not set CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y @@ -43,6 +44,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_VERSION_SIGNATURE="" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -289,7 +291,7 @@ CONFIG_MACH_OMAP_GENERIC=y # # TI OMAP2/3/4 Specific Features # -CONFIG_ARCH_OMAP2PLUS_TYPICAL=y +# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set CONFIG_ARCH_OMAP2=y CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y @@ -701,6 +703,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +CONFIG_SR_REPORT_TIME_LIMIT=100 CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y CONFIG_MTD=y @@ -1162,8 +1165,7 @@ CONFIG_SERIAL_8250_RSA=y # CONFIG_SERIAL_MAX3107 is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_OMAP=y -CONFIG_SERIAL_OMAP_CONSOLE=y +# CONFIG_SERIAL_OMAP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set @@ -2012,6 +2014,11 @@ CONFIG_CLKDEV_LOOKUP=y # CONFIG_HWSPINLOCK is not set # +# Ubuntu Supplied Third-Party Device Drivers +# +# CONFIG_AUFS_FS is not set + +# # File systems # # CONFIG_EXT2_FS is not set @@ -2029,7 +2036,8 @@ CONFIG_FS_MBCACHE=y # CONFIG_JFS_FS is not set # CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set -# CONFIG_BTRFS_FS is not set +CONFIG_BTRFS_FS=y +CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_NILFS2_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y @@ -2047,6 +2055,7 @@ CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set +# CONFIG_OVERLAYFS_FS is not set # # Caches @@ -2328,6 +2337,7 @@ CONFIG_SECURITY=y # CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_TOMOYO is not set # CONFIG_SECURITY_APPARMOR is not set +# CONFIG_SECURITY_YAMA is not set # CONFIG_IMA is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" |