diff options
author | Linas Vepstas <linas@austin.ibm.com> | 2007-09-06 13:45:21 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:33:24 -0400 |
commit | e788ff13be03c2cc4055d5569b7b218dc3f2cb7b (patch) | |
tree | 68168002f0368e40aa8eb4e83ca50de6e75825fc /arch/powerpc/kernel/prom_init.c | |
parent | bde6c6e16aa489ea76c762fb7ffb0abb48660dd8 (diff) |
[POWERPC] prom_init whitespace cleanup, typo fix
Whitespace cleanup: badly indented lines.
Typo in comment.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
-rw-r--r-- | arch/powerpc/kernel/prom_init.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 29c2160bcbb5..1db10f70ae69 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c | |||
@@ -1199,7 +1199,7 @@ static void __init prom_initialize_tce_table(void) | |||
1199 | if ((type[0] == 0) || (strstr(type, RELOC("pci")) == NULL)) | 1199 | if ((type[0] == 0) || (strstr(type, RELOC("pci")) == NULL)) |
1200 | continue; | 1200 | continue; |
1201 | 1201 | ||
1202 | /* Keep the old logic in tack to avoid regression. */ | 1202 | /* Keep the old logic intact to avoid regression. */ |
1203 | if (compatible[0] != 0) { | 1203 | if (compatible[0] != 0) { |
1204 | if ((strstr(compatible, RELOC("python")) == NULL) && | 1204 | if ((strstr(compatible, RELOC("python")) == NULL) && |
1205 | (strstr(compatible, RELOC("Speedwagon")) == NULL) && | 1205 | (strstr(compatible, RELOC("Speedwagon")) == NULL) && |
@@ -2231,7 +2231,7 @@ static void __init fixup_device_tree(void) | |||
2231 | 2231 | ||
2232 | static void __init prom_find_boot_cpu(void) | 2232 | static void __init prom_find_boot_cpu(void) |
2233 | { | 2233 | { |
2234 | struct prom_t *_prom = &RELOC(prom); | 2234 | struct prom_t *_prom = &RELOC(prom); |
2235 | u32 getprop_rval; | 2235 | u32 getprop_rval; |
2236 | ihandle prom_cpu; | 2236 | ihandle prom_cpu; |
2237 | phandle cpu_pkg; | 2237 | phandle cpu_pkg; |
@@ -2251,7 +2251,7 @@ static void __init prom_find_boot_cpu(void) | |||
2251 | static void __init prom_check_initrd(unsigned long r3, unsigned long r4) | 2251 | static void __init prom_check_initrd(unsigned long r3, unsigned long r4) |
2252 | { | 2252 | { |
2253 | #ifdef CONFIG_BLK_DEV_INITRD | 2253 | #ifdef CONFIG_BLK_DEV_INITRD |
2254 | struct prom_t *_prom = &RELOC(prom); | 2254 | struct prom_t *_prom = &RELOC(prom); |
2255 | 2255 | ||
2256 | if (r3 && r4 && r4 != 0xdeadbeef) { | 2256 | if (r3 && r4 && r4 != 0xdeadbeef) { |
2257 | unsigned long val; | 2257 | unsigned long val; |
@@ -2284,7 +2284,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, | |||
2284 | unsigned long pp, | 2284 | unsigned long pp, |
2285 | unsigned long r6, unsigned long r7) | 2285 | unsigned long r6, unsigned long r7) |
2286 | { | 2286 | { |
2287 | struct prom_t *_prom; | 2287 | struct prom_t *_prom; |
2288 | unsigned long hdr; | 2288 | unsigned long hdr; |
2289 | unsigned long offset = reloc_offset(); | 2289 | unsigned long offset = reloc_offset(); |
2290 | 2290 | ||
@@ -2343,8 +2343,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, | |||
2343 | /* | 2343 | /* |
2344 | * Copy the CPU hold code | 2344 | * Copy the CPU hold code |
2345 | */ | 2345 | */ |
2346 | if (RELOC(of_platform) != PLATFORM_POWERMAC) | 2346 | if (RELOC(of_platform) != PLATFORM_POWERMAC) |
2347 | copy_and_flush(0, KERNELBASE + offset, 0x100, 0); | 2347 | copy_and_flush(0, KERNELBASE + offset, 0x100, 0); |
2348 | 2348 | ||
2349 | /* | 2349 | /* |
2350 | * Do early parsing of command line | 2350 | * Do early parsing of command line |