diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /include/asm-ppc/pnp.h | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'include/asm-ppc/pnp.h')
| -rw-r--r-- | include/asm-ppc/pnp.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc/pnp.h b/include/asm-ppc/pnp.h index 53f27eff4..15335ff35 100644 --- a/include/asm-ppc/pnp.h +++ b/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 @@ typedef union _PnP_TAG_PACKET { } PnP_TAG_PACKET; +#endif /* __ASSEMBLY__ */ #endif /* ndef _PNP_ */ |