[PATCH 01/10] powerpc: Remove use of CONFIG_PPC_MERGE

[Michael Ellerman]

On Fri, 2008-08-01 at 11:44 -0500, Kumar Gala wrote:
> Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore remove
> the dead code associated with !CONFIG_PPC_MERGE out of arch/powerpc
> and include/asm-powerpc.
...

> diff --git a/include/asm-powerpc/irq.h b/include/asm-powerpc/irq.h
> index 1ef8e30..a372f76 100644
> --- a/include/asm-powerpc/irq.h
> +++ b/include/asm-powerpc/irq.h
...
> -#define	SIU_INT_PC4		((uint)0x3b + CPM_IRQ_OFFSET)
> -#define	SIU_INT_PC3		((uint)0x3c + CPM_IRQ_OFFSET)
> -#define	SIU_INT_PC2		((uint)0x3d + CPM_IRQ_OFFSET)
> -#define	SIU_INT_PC1		((uint)0x3e + CPM_IRQ_OFFSET)
> -#define	SIU_INT_PC0		((uint)0x3f + CPM_IRQ_OFFSET)
> -
> -#endif /* CONFIG_8260 */
> -
> -#endif /* Whatever way too big #ifdef */

I'll miss that one, it made me laugh once.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20080802/9b489bb3/attachment.pgp>