diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
| commit | 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (patch) | |
| tree | db2ce73665b250672f5f5c0cf7544ec370c122f9 /arch/ppc64/configs | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
| parent | c594adad5653491813959277fb87a2fef54c4e05 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/configs')
| -rw-r--r-- | arch/ppc64/configs/iSeries_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/configs/iSeries_defconfig b/arch/ppc64/configs/iSeries_defconfig index 394ba18b58c..219c6677abc 100644 --- a/arch/ppc64/configs/iSeries_defconfig +++ b/arch/ppc64/configs/iSeries_defconfig @@ -99,7 +99,6 @@ CONFIG_HZ_100=y # CONFIG_HZ_1000 is not set CONFIG_HZ=100 CONFIG_GENERIC_HARDIRQS=y -CONFIG_MSCHUNKS=y CONFIG_LPARCFG=y CONFIG_SECCOMP=y CONFIG_ISA_DMA_API=y |