diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-15 14:19:08 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-20 20:16:12 -0400 |
commit | bc58450b023c5815e5bc54e6d43edbd1e3576fe6 (patch) | |
tree | 9ddcb35dfaa0ea9b375d55bb1de0a0cbee05dea3 /init | |
parent | f5339277eb8d3aed37f12a27988366f68ab68930 (diff) |
init: Remove CONFIG_PPC_ISERIES
It is no longer selectable, so remove the check for it.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'init')
-rw-r--r-- | 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 887629e24c54..01f1306aa26e 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c | |||
@@ -178,7 +178,7 @@ int __init rd_load_image(char *from) | |||
178 | char *buf = NULL; | 178 | char *buf = NULL; |
179 | unsigned short rotate = 0; | 179 | unsigned short rotate = 0; |
180 | decompress_fn decompressor = NULL; | 180 | decompress_fn decompressor = NULL; |
181 | #if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES) | 181 | #if !defined(CONFIG_S390) |
182 | char rotator[4] = { '|' , '/' , '-' , '\\' }; | 182 | char rotator[4] = { '|' , '/' , '-' , '\\' }; |
183 | #endif | 183 | #endif |
184 | 184 | ||
@@ -264,7 +264,7 @@ int __init rd_load_image(char *from) | |||
264 | } | 264 | } |
265 | sys_read(in_fd, buf, BLOCK_SIZE); | 265 | sys_read(in_fd, buf, BLOCK_SIZE); |
266 | sys_write(out_fd, buf, BLOCK_SIZE); | 266 | sys_write(out_fd, buf, BLOCK_SIZE); |
267 | #if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES) | 267 | #if !defined(CONFIG_S390) |
268 | if (!(i % 16)) { | 268 | if (!(i % 16)) { |
269 | printk("%c\b", rotator[rotate & 0x3]); | 269 | printk("%c\b", rotator[rotate & 0x3]); |
270 | rotate++; | 270 | rotate++; |