diff options
| author | Holger Brunck <holger.brunck@keymile.com> | 2012-12-07 16:09:16 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2013-02-13 14:49:08 +0100 |
| commit | ed59b3eca05a1afe1605238494020007a1cdaa4f (patch) | |
| tree | 450c96497b8c9c6cef64d38e4def34a98ab283c8 /arch/powerpc | |
| parent | powerpc/83xx: apply mpc8360e quirk for kmeter1 only when par_io is present (diff) | |
| download | linux-ed59b3eca05a1afe1605238494020007a1cdaa4f.tar.xz linux-ed59b3eca05a1afe1605238494020007a1cdaa4f.zip | |
powerpc/83xx: update kmeter1_defconfig
Synchronize this defconfig with latest kernel version.
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/configs/83xx/kmeter1_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig index a0dfef1fcdb7..e12e60c3b9a2 100644 --- a/arch/powerpc/configs/83xx/kmeter1_defconfig +++ b/arch/powerpc/configs/83xx/kmeter1_defconfig @@ -2,6 +2,8 @@ CONFIG_EXPERIMENTAL=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_EXPERT=y CONFIG_SLAB=y @@ -16,8 +18,6 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PPC_PMAC is not set CONFIG_PPC_83xx=y CONFIG_KMETER1=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y # CONFIG_SECCOMP is not set CONFIG_NET=y @@ -45,7 +45,6 @@ CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_PHRAM=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_GLUEBI=y -CONFIG_MTD_UBI_DEBUG=y CONFIG_PROC_DEVICETREE=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y @@ -76,5 +75,4 @@ CONFIG_TMPFS=y CONFIG_JFFS2_FS=y CONFIG_UBIFS_FS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y |