diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:35:33 -0400 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /arch/sh/configs | |
| parent | a375b15164dd9264f724ad941825e52c90145151 (diff) | |
| parent | 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/sh/configs')
| -rw-r--r-- | arch/sh/configs/apsh4ad0a_defconfig | 1 | ||||
| -rw-r--r-- | arch/sh/configs/sdk7786_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig index e71a531f1e31..77ec0e7b8ddf 100644 --- a/arch/sh/configs/apsh4ad0a_defconfig +++ b/arch/sh/configs/apsh4ad0a_defconfig | |||
| @@ -48,7 +48,6 @@ CONFIG_PREEMPT=y | |||
| 48 | CONFIG_BINFMT_MISC=y | 48 | CONFIG_BINFMT_MISC=y |
| 49 | CONFIG_PM=y | 49 | CONFIG_PM=y |
| 50 | CONFIG_PM_DEBUG=y | 50 | CONFIG_PM_DEBUG=y |
| 51 | CONFIG_PM_VERBOSE=y | ||
| 52 | CONFIG_PM_RUNTIME=y | 51 | CONFIG_PM_RUNTIME=y |
| 53 | CONFIG_CPU_IDLE=y | 52 | CONFIG_CPU_IDLE=y |
| 54 | CONFIG_NET=y | 53 | CONFIG_NET=y |
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index dc4a2eb6a616..c41650572d79 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig | |||
| @@ -83,7 +83,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y | |||
| 83 | CONFIG_BINFMT_MISC=y | 83 | CONFIG_BINFMT_MISC=y |
| 84 | CONFIG_PM=y | 84 | CONFIG_PM=y |
| 85 | CONFIG_PM_DEBUG=y | 85 | CONFIG_PM_DEBUG=y |
| 86 | CONFIG_PM_VERBOSE=y | ||
| 87 | CONFIG_PM_RUNTIME=y | 86 | CONFIG_PM_RUNTIME=y |
| 88 | CONFIG_CPU_IDLE=y | 87 | CONFIG_CPU_IDLE=y |
| 89 | CONFIG_NET=y | 88 | CONFIG_NET=y |