Merge branch 'master' into mixer_fix

This commit is contained in:
Lorenz Meier 2013-09-22 12:28:21 +02:00
commit d29a1b69e5
1 changed files with 1 additions and 1 deletions

View File

@ -410,7 +410,7 @@ CONFIG_START_DAY=1
CONFIG_DEV_CONSOLE=y CONFIG_DEV_CONSOLE=y
# CONFIG_MUTEX_TYPES is not set # CONFIG_MUTEX_TYPES is not set
CONFIG_PRIORITY_INHERITANCE=y CONFIG_PRIORITY_INHERITANCE=y
CONFIG_SEM_PREALLOCHOLDERS=8 CONFIG_SEM_PREALLOCHOLDERS=0
CONFIG_SEM_NNESTPRIO=8 CONFIG_SEM_NNESTPRIO=8
# CONFIG_FDCLONE_DISABLE is not set # CONFIG_FDCLONE_DISABLE is not set
CONFIG_FDCLONE_STDIO=y CONFIG_FDCLONE_STDIO=y