diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /include/asm-mips64 | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'include/asm-mips64')
| -rw-r--r-- | include/asm-mips64/dma.h | 10 | ||||
| -rw-r--r-- | include/asm-mips64/ide.h | 12 |
2 files changed, 18 insertions, 4 deletions
diff --git a/include/asm-mips64/dma.h b/include/asm-mips64/dma.h index ef380f1d4..df2f47f6c 100644 --- a/include/asm-mips64/dma.h +++ b/include/asm-mips64/dma.h @@ -1,4 +1,4 @@ -/* $Id: dma.h,v 1.4 2000/01/29 01:42:28 ralf Exp $ +/* $Id: dma.h,v 1.5 2000/03/07 15:45:42 ralf Exp $ * * linux/include/asm/dma.h: Defines for using and allocating dma channels. * Written by Hennus Bergman, 1992. @@ -295,4 +295,12 @@ static __inline__ int get_dma_residue(unsigned int dmanr) extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ extern void free_dma(unsigned int dmanr); /* release it again */ +/* From PCI */ + +#ifdef CONFIG_PCI +extern int isa_dma_bridge_buggy; +#else +#define isa_dma_bridge_buggy (0) +#endif + #endif /* _ASM_DMA_H */ diff --git a/include/asm-mips64/ide.h b/include/asm-mips64/ide.h index 879f6c8a9..bb3a32200 100644 --- a/include/asm-mips64/ide.h +++ b/include/asm-mips64/ide.h @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: ide.h,v 1.1 1999/08/21 22:19:17 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -14,8 +14,14 @@ #ifdef __KERNEL__ +#include <linux/config.h> + #ifndef MAX_HWIFS +# ifdef CONFIG_BLK_DEV_IDEPCI +#define MAX_HWIFS 10 +# else #define MAX_HWIFS 6 +# endif #endif #define ide__sti() __sti() @@ -64,7 +70,7 @@ ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, */ static inline void ide_init_default_hwifs(void) { -#ifdef __DO_I_NEED_THIS +#ifndef CONFIG_BLK_DEV_IDEPCI hw_regs_t hw; int index; @@ -73,7 +79,7 @@ static inline void ide_init_default_hwifs(void) hw.irq = ide_default_irq(ide_default_io_base(index)); ide_register_hw(&hw, NULL); } -#endif /* __DO_I_NEED_THIS */ +#endif /* CONFIG_BLK_DEV_IDEPCI */ } typedef union { |