diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/sh/configs/sdk7786_defconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/sh/configs/sdk7786_defconfig')
| -rw-r--r-- | arch/sh/configs/sdk7786_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index dc4a2eb6a616..8a7dd7b59c5c 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig | |||
| @@ -12,7 +12,6 @@ CONFIG_IKCONFIG=y | |||
| 12 | CONFIG_IKCONFIG_PROC=y | 12 | CONFIG_IKCONFIG_PROC=y |
| 13 | CONFIG_CGROUPS=y | 13 | CONFIG_CGROUPS=y |
| 14 | CONFIG_CGROUP_DEBUG=y | 14 | CONFIG_CGROUP_DEBUG=y |
| 15 | CONFIG_CGROUP_NS=y | ||
| 16 | CONFIG_CGROUP_FREEZER=y | 15 | CONFIG_CGROUP_FREEZER=y |
| 17 | CONFIG_CGROUP_DEVICE=y | 16 | CONFIG_CGROUP_DEVICE=y |
| 18 | CONFIG_CPUSETS=y | 17 | CONFIG_CPUSETS=y |
| @@ -83,7 +82,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y | |||
| 83 | CONFIG_BINFMT_MISC=y | 82 | CONFIG_BINFMT_MISC=y |
| 84 | CONFIG_PM=y | 83 | CONFIG_PM=y |
| 85 | CONFIG_PM_DEBUG=y | 84 | CONFIG_PM_DEBUG=y |
| 86 | CONFIG_PM_VERBOSE=y | ||
| 87 | CONFIG_PM_RUNTIME=y | 85 | CONFIG_PM_RUNTIME=y |
| 88 | CONFIG_CPU_IDLE=y | 86 | CONFIG_CPU_IDLE=y |
| 89 | CONFIG_NET=y | 87 | CONFIG_NET=y |