projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f533927
)
init: Remove CONFIG_PPC_ISERIES
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Thu, 15 Mar 2012 18:19:08 +0000
(18:19 +0000)
committer
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Wed, 21 Mar 2012 00:16:12 +0000
(11:16 +1100)
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>
init/do_mounts_rd.c
patch
|
blob
|
history
diff --git
a/init/do_mounts_rd.c
b/init/do_mounts_rd.c
index
887629e
..
01f1306
100644
(file)
--- 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++;