From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: ppc-dev <linuxppc-dev@lists.ozlabs.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/5] init: remove CONFIG_PPC_ISERIES
Date: Fri, 16 Mar 2012 15:19:08 +1100 [thread overview]
Message-ID: <20120316151908.e982ce41d848c2b2a4bc045f@canb.auug.org.au> (raw)
In-Reply-To: <20120316151459.dab3cdcc2d5984b05e2d2b5c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]
It is no longer selectable, so remove the check for it.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
init/do_mounts_rd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 887629e..01f1306 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -178,7 +178,7 @@ int __init rd_load_image(char *from)
char *buf = NULL;
unsigned short rotate = 0;
decompress_fn decompressor = NULL;
-#if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES)
+#if !defined(CONFIG_S390)
char rotator[4] = { '|' , '/' , '-' , '\\' };
#endif
@@ -264,7 +264,7 @@ int __init rd_load_image(char *from)
}
sys_read(in_fd, buf, BLOCK_SIZE);
sys_write(out_fd, buf, BLOCK_SIZE);
-#if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES)
+#if !defined(CONFIG_S390)
if (!(i % 16)) {
printk("%c\b", rotator[rotate & 0x3]);
rotate++;
--
1.7.9.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-03-16 4:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-16 4:14 [PATCH 0/5] powerpc: clean up almos all the rest of the iSeries platform code Stephen Rothwell
2012-03-16 4:16 ` [PATCH 1/5] tty/hvc_vio: FW_FEATURE_ISERIES is no longer selectable Stephen Rothwell
2012-03-16 15:19 ` Greg KH
2012-03-16 4:18 ` [PATCH 2/5] powerpc: remove FW_FEATURE ISERIES from arch code Stephen Rothwell
2012-03-16 4:19 ` Stephen Rothwell [this message]
2012-03-16 4:20 ` [PATCH 4/5] powerpc: remove the remaining CONFIG_PPC_ISERIES pieces Stephen Rothwell
2012-03-16 4:22 ` [PATCH 5/5] powerpc: remove the rest of the legacy iSeries include files Stephen Rothwell
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=20120316151908.e982ce41d848c2b2a4bc045f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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