diff options
Diffstat (limited to 'arch/powerpc/configs/pseries_defconfig')
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index c568329723b8..ca9ff9aad74a 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -230,11 +230,11 @@ CONFIG_TICK_ONESHOT=y | |||
230 | CONFIG_NO_HZ=y | 230 | CONFIG_NO_HZ=y |
231 | CONFIG_HIGH_RES_TIMERS=y | 231 | CONFIG_HIGH_RES_TIMERS=y |
232 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 232 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
233 | # CONFIG_HZ_100 is not set | 233 | CONFIG_HZ_100=y |
234 | CONFIG_HZ_250=y | 234 | # CONFIG_HZ_250 is not set |
235 | # CONFIG_HZ_300 is not set | 235 | # CONFIG_HZ_300 is not set |
236 | # CONFIG_HZ_1000 is not set | 236 | # CONFIG_HZ_1000 is not set |
237 | CONFIG_HZ=250 | 237 | CONFIG_HZ=100 |
238 | CONFIG_SCHED_HRTICK=y | 238 | CONFIG_SCHED_HRTICK=y |
239 | CONFIG_PREEMPT_NONE=y | 239 | CONFIG_PREEMPT_NONE=y |
240 | # CONFIG_PREEMPT_VOLUNTARY is not set | 240 | # CONFIG_PREEMPT_VOLUNTARY is not set |
@@ -796,7 +796,7 @@ CONFIG_E100=y | |||
796 | # CONFIG_NET_POCKET is not set | 796 | # CONFIG_NET_POCKET is not set |
797 | # CONFIG_ATL2 is not set | 797 | # CONFIG_ATL2 is not set |
798 | CONFIG_NETDEV_1000=y | 798 | CONFIG_NETDEV_1000=y |
799 | CONFIG_ACENIC=y | 799 | CONFIG_ACENIC=m |
800 | CONFIG_ACENIC_OMIT_TIGON_I=y | 800 | CONFIG_ACENIC_OMIT_TIGON_I=y |
801 | # CONFIG_DL2K is not set | 801 | # CONFIG_DL2K is not set |
802 | CONFIG_E1000=y | 802 | CONFIG_E1000=y |
@@ -834,8 +834,8 @@ CONFIG_S2IO=m | |||
834 | # CONFIG_BNX2X is not set | 834 | # CONFIG_BNX2X is not set |
835 | # CONFIG_QLGE is not set | 835 | # CONFIG_QLGE is not set |
836 | # CONFIG_SFC is not set | 836 | # CONFIG_SFC is not set |
837 | CONFIG_TR=y | 837 | # CONFIG_TR is not set |
838 | CONFIG_IBMOL=y | 838 | # CONFIG_IBMOL is not set |
839 | # CONFIG_3C359 is not set | 839 | # CONFIG_3C359 is not set |
840 | # CONFIG_TMS380TR is not set | 840 | # CONFIG_TMS380TR is not set |
841 | 841 | ||
@@ -1494,7 +1494,7 @@ CONFIG_CONFIGFS_FS=m | |||
1494 | # CONFIG_BEFS_FS is not set | 1494 | # CONFIG_BEFS_FS is not set |
1495 | # CONFIG_BFS_FS is not set | 1495 | # CONFIG_BFS_FS is not set |
1496 | # CONFIG_EFS_FS is not set | 1496 | # CONFIG_EFS_FS is not set |
1497 | CONFIG_CRAMFS=y | 1497 | CONFIG_CRAMFS=m |
1498 | # CONFIG_VXFS_FS is not set | 1498 | # CONFIG_VXFS_FS is not set |
1499 | # CONFIG_MINIX_FS is not set | 1499 | # CONFIG_MINIX_FS is not set |
1500 | # CONFIG_OMFS_FS is not set | 1500 | # CONFIG_OMFS_FS is not set |