diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-23 18:09:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-23 18:09:27 +0200 |
| commit | 1f6d80358dc9bbbeb56cb43384fa11fd645d9289 (patch) | |
| tree | 152bfa5165292a8e4f06d536b6d222a68480e573 /arch/powerpc/configs/pseries_defconfig | |
| parent | net: sched: fix compile warning in cls_u32 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-1f6d80358dc9bbbeb56cb43384fa11fd645d9289.tar.xz linux-1f6d80358dc9bbbeb56cb43384fa11fd645d9289.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/mips/net/bpf_jit.c
drivers/net/can/flexcan.c
Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/configs/pseries_defconfig')
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index a905063281cc..50375f1f59e7 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -5,6 +5,7 @@ CONFIG_SMP=y CONFIG_NR_CPUS=2048 CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y +CONFIG_FHANDLE=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_IRQ_DOMAIN_DEBUG=y |