diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /include/asm-frv/ide.h | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
Diffstat (limited to 'include/asm-frv/ide.h')
| -rw-r--r-- | include/asm-frv/ide.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/asm-frv/ide.h b/include/asm-frv/ide.h index 7ebcc56a2229..361076611855 100644 --- a/include/asm-frv/ide.h +++ b/include/asm-frv/ide.h | |||
| @@ -18,15 +18,7 @@ | |||
| 18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 19 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
| 20 | 20 | ||
| 21 | /****************************************************************************/ | 21 | #include <asm-generic/ide_iops.h> |
| 22 | /* | ||
| 23 | * some bits needed for parts of the IDE subsystem to compile | ||
| 24 | */ | ||
| 25 | #define __ide_mm_insw(port, addr, n) insw((unsigned long) (port), addr, n) | ||
| 26 | #define __ide_mm_insl(port, addr, n) insl((unsigned long) (port), addr, n) | ||
| 27 | #define __ide_mm_outsw(port, addr, n) outsw((unsigned long) (port), addr, n) | ||
| 28 | #define __ide_mm_outsl(port, addr, n) outsl((unsigned long) (port), addr, n) | ||
| 29 | |||
| 30 | 22 | ||
| 31 | #endif /* __KERNEL__ */ | 23 | #endif /* __KERNEL__ */ |
| 32 | #endif /* _ASM_IDE_H */ | 24 | #endif /* _ASM_IDE_H */ |