lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

init: Remove CONFIG_PPC_ISERIES

Browse Source 
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>
This commit is contained in:
Stephen Rothwell
2012-03-15 18:19:08 +00:00
committed by Benjamin Herrenschmidt
parent f5339277eb
commit bc58450b02
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init/do_mounts_rd.c
View File

@@ -178,7 +178,7 @@ int __init rd_load_image(char *from)
char *buf = NULL; char *buf = NULL;
unsigned short rotate = 0; unsigned short rotate = 0;
decompress_fn decompressor = NULL; decompress_fn decompressor = NULL;
#if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES) #if !defined(CONFIG_S390)
char rotator[4] = { '|' , '/' , '-' , '\\' }; char rotator[4] = { '|' , '/' , '-' , '\\' };
#endif #endif
@@ -264,7 +264,7 @@ int __init rd_load_image(char *from)
} }
sys_read(in_fd, buf, BLOCK_SIZE); sys_read(in_fd, buf, BLOCK_SIZE);
sys_write(out_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)) { if (!(i % 16)) {
printk("%c\b", rotator[rotate & 0x3]); printk("%c\b", rotator[rotate & 0x3]);
rotate++; rotate++;