diff options
| author | Chris Zankel <chris@zankel.net> | 2014-10-21 08:26:01 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-10-21 08:26:01 +0400 |
| commit | a13926db3e5ea5bbac297f59e9f35061f52892d3 (patch) | |
| tree | b794f25550b7dbbe9cc8eda81633df9023b4821c /arch/powerpc/configs/ppc64e_defconfig | |
| parent | f2589bff1ce8b94cebc044e5dfeac4d4e8701cbc (diff) | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| download | linux-a13926db3e5ea5bbac297f59e9f35061f52892d3.tar.xz | |
Merge tag 'v3.18-rc1' into for_next
Linux 3.18-rc1
Diffstat (limited to 'arch/powerpc/configs/ppc64e_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64e_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig index 438e813dc9cb..c3a3269b0865 100644 --- a/arch/powerpc/configs/ppc64e_defconfig +++ b/arch/powerpc/configs/ppc64e_defconfig @@ -3,6 +3,7 @@ CONFIG_PPC_BOOK3E_64=y CONFIG_SMP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y +CONFIG_FHANDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_TASKSTATS=y @@ -32,6 +33,7 @@ CONFIG_SPARSEMEM_MANUAL=y CONFIG_PCI_MSI=y CONFIG_PCCARD=y CONFIG_HOTPLUG_PCI=y +CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_XFRM_USER=m |