From: hanjun.guo@linaro.org (Hanjun Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: Fix duplicated Kconfig entries again
Date: Tue, 25 Mar 2014 17:00:59 +0800 [thread overview]
Message-ID: <1395738060-18489-1-git-send-email-hanjun.guo@linaro.org> (raw)
After commit 74397174989e5 (arm64: Fix duplicated Kconfig entries),
I still get a duplicate Power management options section in linux-next
git repo, may be due to some merge conflicts, anyway, fix that in this
patch.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
Based on linux-next repo, weird, did I miss something?
---
arch/arm64/Kconfig | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index d9f23ad..6085dca 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -317,24 +317,12 @@ config ARCH_SUSPEND_POSSIBLE
config ARM64_CPU_SUSPEND
def_bool PM_SLEEP
-endmenu
-
-menu "CPU Power Management"
-
source "drivers/cpuidle/Kconfig"
source "drivers/cpufreq/Kconfig"
endmenu
-menu "Power management options"
-
-source "kernel/power/Kconfig"
-
-source "drivers/cpufreq/Kconfig"
-
-endmenu
-
source "net/Kconfig"
source "drivers/Kconfig"
--
1.7.9.5
next reply other threads:[~2014-03-25 9:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 9:00 Hanjun Guo [this message]
2014-03-25 10:00 ` [Linaro-acpi] [PATCH] arm64: Fix duplicated Kconfig entries again Sudeep Holla
2014-03-25 11:09 ` Hanjun Guo
2014-03-27 11:12 ` Sudeep Holla
2014-03-27 12:34 ` Hanjun Guo
2014-03-27 15:18 ` Rafael J. Wysocki
2014-04-03 8:35 ` Hanjun Guo
2014-04-03 8:41 ` Viresh Kumar
2014-04-03 8:51 ` Catalin Marinas
2014-04-03 9:27 ` Hanjun Guo
2014-04-03 9:30 ` Hanjun Guo
2014-04-03 9:38 ` Viresh Kumar
2014-04-03 11:01 ` Hanjun Guo
[not found] <CA+5PVA6awqaSHQboqdv9nynV9Xjp46VeqijDWxZX1v5wDK0NWQ@mail.gmail.com>
2014-04-02 5:06 ` arm64/cqufreq Kconfig error with v3.14-3893-gc12e69c6aaf7 Viresh Kumar
2014-04-02 14:40 ` [PATCH] arm64: Fix duplicated Kconfig entries again Josh Boyer
2014-04-03 4:23 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395738060-18489-1-git-send-email-hanjun.guo@linaro.org \
--to=hanjun.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).