patch-2.1.53 linux/include/asm-ppc/pnp.h

Next file: linux/include/asm-ppc/processor.h
Previous file: linux/include/asm-ppc/page.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.52/linux/include/asm-ppc/pnp.h linux/include/asm-ppc/pnp.h
@@ -17,10 +17,11 @@
 #ifndef _PNP_
 #define _PNP_
 
+#ifndef __ASSEMBLY__
 #define MAX_MEM_REGISTERS 9
 #define MAX_IO_PORTS 20
 #define MAX_IRQS 7
-#define MAX_DMA_CHANNELS 7
+/*#define MAX_DMA_CHANNELS 7*/
 
 /* Interrupt controllers */
 
@@ -638,4 +639,5 @@
 
   } PnP_TAG_PACKET;
 
+#endif /* __ASSEMBLY__ */
 #endif  /* ndef _PNP_ */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov