diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-15 18:19:08 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 11:16:12 +1100 |
| commit | bc58450b023c5815e5bc54e6d43edbd1e3576fe6 (patch) | |
| tree | 9ddcb35dfaa0ea9b375d55bb1de0a0cbee05dea3 /init | |
| parent | f5339277eb8d3aed37f12a27988366f68ab68930 (diff) | |
| download | linux-stable-bc58450b023c5815e5bc54e6d43edbd1e3576fe6.tar.gz linux-stable-bc58450b023c5815e5bc54e6d43edbd1e3576fe6.tar.bz2 linux-stable-bc58450b023c5815e5bc54e6d43edbd1e3576fe6.zip | |
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) 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++; |