2004-10-28 20:59:07

by Tom Rini

[permalink] [raw]
Subject: [PATCH 2.6.10-rc1-bk7] Fix ppc32 compile (Was: Re: prep_setup.c syntax error)

On Thu, Oct 28, 2004 at 10:15:34PM +0200, Olaf Hering wrote:

> the last patch doesnt compile.
>
> linux-2.6.10-rc1-bk7/arch/ppc/platforms/prep_setup.c:967: error: parse error before "return"
>
>
> http://linux.bkbits.net:8080/linux-2.5/gnupatch@41801ba70RWW4DIxeswrgPg6ExEg2w

D'oh. Something got cut-off there on Randy's end. Obviously correct
fix follows.

Signed-off-by: Tom Rini <[email protected]>

--- 1.57/arch/ppc/platforms/prep_setup.c 2004-10-27 15:05:16 -07:00
+++ edited/arch/ppc/platforms/prep_setup.c 2004-10-28 13:55:20 -07:00
@@ -964,7 +964,8 @@
if (OpenPIC_Addr != NULL)
/* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
- return 0;
+ i8259_irq);
+ return 0;
}
arch_initcall(prep_request_cascade);

--
Tom Rini
http://gate.crashing.org/~trini/