asm-ppc header issues when building ARCH=powerpc

[Kumar Gala]

Guys,

I was wondering if I could get your help with looking at the  
following lists and determining if we have an issue or not related  
the following files:

Getting some classification on these would be good.  Possibly  
classifications, doesn't build in ARCH=powerpc, remove include, real  
issue, etc.

- k

./include/asm-powerpc/irq.h:#include <asm/mpc83xx.h>	- protected by ! 
CONFIG_PPC_MERGE

./drivers/ide/ppc/mpc8xx.c:#include <asm/residual.h>

./drivers/mtd/maps/tqm834x.c:#include <asm/ppcboot.h>
./drivers/mtd/maps/pq2fads.c:#include <asm/ppcboot.h>

./drivers/i2c/busses/i2c-ibm_iic.c:#include <asm/ibm4xx.h>
./drivers/mtd/maps/walnut.c:#include <asm/ibm4xx.h>
./include/asm-powerpc/irq.h:#include <asm/ibm4xx.h>	- protected by ! 
CONFIG_PPC_MERGE

./drivers/mtd/maps/ebony.c:#include <asm/ibm44x.h>
./drivers/mtd/maps/ocotea.c:#include <asm/ibm44x.h>
./drivers/mtd/nand/ndfc.c:#include <asm/ibm44x.h>
./include/asm-powerpc/irq.h:#include <asm/ibm44x.h>	- protected by ! 
CONFIG_PPC_MERGE

./drivers/i2c/busses/i2c-ibm_iic.c:#include <asm/ocp.h>
./drivers/net/ucc_geth_mii.c:#include <asm/ocp.h>	- just bogus, needs  
removal
./drivers/net/ibm_emac/ibm_emac_core.c:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_core.h:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_tah.h:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_phy.c:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_mal.c:#include <asm/ocp.h>
./drivers/net/ibm_emac/ibm_emac_zmii.h:#include <asm/ocp.h>

./drivers/macintosh/adb-iop.c:#include <asm/bootinfo.h>
./drivers/char/vme_scc.c:#include <asm/bootinfo.h>
./drivers/char/serial167.c:#include <asm/bootinfo.h>
./drivers/serial/dz.c:#include <asm/bootinfo.h>
./drivers/mtd/devices/ms02-nv.c:#include <asm/bootinfo.h>
./drivers/net/macsonic.c:#include <asm/bootinfo.h>
./drivers/net/jazzsonic.c:#include <asm/bootinfo.h>
./drivers/video/pmag-aa-fb.c:#include <asm/bootinfo.h>
./drivers/video/maxinefb.c:#include <asm/bootinfo.h>
./drivers/video/logo/logo.c:#include <asm/bootinfo.h>
./drivers/video/valkyriefb.c:#include <asm/bootinfo.h>
./drivers/video/macfb.c:#include <asm/bootinfo.h>