diff options
author | Holger Brunck <holger.brunck@keymile.com> | 2012-12-07 10:09:16 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2013-02-13 08:49:08 -0500 |
commit | ed59b3eca05a1afe1605238494020007a1cdaa4f (patch) | |
tree | 450c96497b8c9c6cef64d38e4def34a98ab283c8 /arch/powerpc | |
parent | 9c2f451e0db90d257c745df1d967c8010f14f0dd (diff) |
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 | |||
2 | # CONFIG_SWAP is not set | 2 | # CONFIG_SWAP is not set |
3 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
4 | CONFIG_POSIX_MQUEUE=y | 4 | CONFIG_POSIX_MQUEUE=y |
5 | CONFIG_NO_HZ=y | ||
6 | CONFIG_HIGH_RES_TIMERS=y | ||
5 | CONFIG_LOG_BUF_SHIFT=14 | 7 | CONFIG_LOG_BUF_SHIFT=14 |
6 | CONFIG_EXPERT=y | 8 | CONFIG_EXPERT=y |
7 | CONFIG_SLAB=y | 9 | CONFIG_SLAB=y |
@@ -16,8 +18,6 @@ CONFIG_PARTITION_ADVANCED=y | |||
16 | # CONFIG_PPC_PMAC is not set | 18 | # CONFIG_PPC_PMAC is not set |
17 | CONFIG_PPC_83xx=y | 19 | CONFIG_PPC_83xx=y |
18 | CONFIG_KMETER1=y | 20 | CONFIG_KMETER1=y |
19 | CONFIG_NO_HZ=y | ||
20 | CONFIG_HIGH_RES_TIMERS=y | ||
21 | CONFIG_PREEMPT=y | 21 | CONFIG_PREEMPT=y |
22 | # CONFIG_SECCOMP is not set | 22 | # CONFIG_SECCOMP is not set |
23 | CONFIG_NET=y | 23 | CONFIG_NET=y |
@@ -45,7 +45,6 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
45 | CONFIG_MTD_PHRAM=y | 45 | CONFIG_MTD_PHRAM=y |
46 | CONFIG_MTD_UBI=y | 46 | CONFIG_MTD_UBI=y |
47 | CONFIG_MTD_UBI_GLUEBI=y | 47 | CONFIG_MTD_UBI_GLUEBI=y |
48 | CONFIG_MTD_UBI_DEBUG=y | ||
49 | CONFIG_PROC_DEVICETREE=y | 48 | CONFIG_PROC_DEVICETREE=y |
50 | CONFIG_NETDEVICES=y | 49 | CONFIG_NETDEVICES=y |
51 | CONFIG_DUMMY=y | 50 | CONFIG_DUMMY=y |
@@ -76,5 +75,4 @@ CONFIG_TMPFS=y | |||
76 | CONFIG_JFFS2_FS=y | 75 | CONFIG_JFFS2_FS=y |
77 | CONFIG_UBIFS_FS=y | 76 | CONFIG_UBIFS_FS=y |
78 | CONFIG_NFS_FS=y | 77 | CONFIG_NFS_FS=y |
79 | CONFIG_NFS_V3=y | ||
80 | CONFIG_ROOT_NFS=y | 78 | CONFIG_ROOT_NFS=y |