diff options
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 252401824575..7b3804a6e363 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -304,11 +304,11 @@ CONFIG_TICK_ONESHOT=y | |||
304 | CONFIG_NO_HZ=y | 304 | CONFIG_NO_HZ=y |
305 | CONFIG_HIGH_RES_TIMERS=y | 305 | CONFIG_HIGH_RES_TIMERS=y |
306 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 306 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
307 | # CONFIG_HZ_100 is not set | 307 | CONFIG_HZ_100=y |
308 | CONFIG_HZ_250=y | 308 | # CONFIG_HZ_250 is not set |
309 | # CONFIG_HZ_300 is not set | 309 | # CONFIG_HZ_300 is not set |
310 | # CONFIG_HZ_1000 is not set | 310 | # CONFIG_HZ_1000 is not set |
311 | CONFIG_HZ=250 | 311 | CONFIG_HZ=100 |
312 | CONFIG_SCHED_HRTICK=y | 312 | CONFIG_SCHED_HRTICK=y |
313 | CONFIG_PREEMPT_NONE=y | 313 | CONFIG_PREEMPT_NONE=y |
314 | # CONFIG_PREEMPT_VOLUNTARY is not set | 314 | # CONFIG_PREEMPT_VOLUNTARY is not set |
@@ -980,7 +980,7 @@ CONFIG_E100=y | |||
980 | # CONFIG_SC92031 is not set | 980 | # CONFIG_SC92031 is not set |
981 | # CONFIG_ATL2 is not set | 981 | # CONFIG_ATL2 is not set |
982 | CONFIG_NETDEV_1000=y | 982 | CONFIG_NETDEV_1000=y |
983 | CONFIG_ACENIC=y | 983 | CONFIG_ACENIC=m |
984 | CONFIG_ACENIC_OMIT_TIGON_I=y | 984 | CONFIG_ACENIC_OMIT_TIGON_I=y |
985 | # CONFIG_DL2K is not set | 985 | # CONFIG_DL2K is not set |
986 | CONFIG_E1000=y | 986 | CONFIG_E1000=y |
@@ -1023,8 +1023,8 @@ CONFIG_PASEMI_MAC=y | |||
1023 | # CONFIG_BNX2X is not set | 1023 | # CONFIG_BNX2X is not set |
1024 | # CONFIG_QLGE is not set | 1024 | # CONFIG_QLGE is not set |
1025 | # CONFIG_SFC is not set | 1025 | # CONFIG_SFC is not set |
1026 | CONFIG_TR=y | 1026 | # CONFIG_TR is not set |
1027 | CONFIG_IBMOL=y | 1027 | # CONFIG_IBMOL is not set |
1028 | # CONFIG_3C359 is not set | 1028 | # CONFIG_3C359 is not set |
1029 | # CONFIG_TMS380TR is not set | 1029 | # CONFIG_TMS380TR is not set |
1030 | 1030 | ||
@@ -1863,7 +1863,7 @@ CONFIG_HFSPLUS_FS=m | |||
1863 | # CONFIG_BEFS_FS is not set | 1863 | # CONFIG_BEFS_FS is not set |
1864 | # CONFIG_BFS_FS is not set | 1864 | # CONFIG_BFS_FS is not set |
1865 | # CONFIG_EFS_FS is not set | 1865 | # CONFIG_EFS_FS is not set |
1866 | CONFIG_CRAMFS=y | 1866 | CONFIG_CRAMFS=m |
1867 | # CONFIG_VXFS_FS is not set | 1867 | # CONFIG_VXFS_FS is not set |
1868 | # CONFIG_MINIX_FS is not set | 1868 | # CONFIG_MINIX_FS is not set |
1869 | # CONFIG_OMFS_FS is not set | 1869 | # CONFIG_OMFS_FS is not set |