diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-21 11:20:16 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-06-21 11:20:16 +1000 |
commit | 5191f590cbc0c04b09b3b479767182cc59d64c34 (patch) | |
tree | a37a999358b0762a2a9da112023d1b52f106647b /arch | |
parent | 1586fdbe1c16e5461ddf95a34c7bd21fcc0013f4 (diff) | |
parent | 08a817dae9301ab46459eb13af057c972c9797c7 (diff) |
Merge remote branch 'm68knommu/for-next'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/include/asm/ide.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/ide.h b/arch/m68k/include/asm/ide.h index 3958726664ba..492fee8a1ab2 100644 --- a/arch/m68k/include/asm/ide.h +++ b/arch/m68k/include/asm/ide.h @@ -1,6 +1,4 @@ /* - * linux/include/asm-m68k/ide.h - * * Copyright (C) 1994-1996 Linus Torvalds & authors */ @@ -34,6 +32,8 @@ #include <asm/io.h> #include <asm/irq.h> +#ifdef CONFIG_MMU + /* * Get rid of defs from io.h - ide has its private and conflicting versions * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we @@ -53,5 +53,14 @@ #define __ide_mm_outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) #define __ide_mm_outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) +#else + +#define __ide_mm_insw(port, addr, n) io_insw((unsigned int)port, addr, n) +#define __ide_mm_insl(port, addr, n) io_insl((unsigned int)port, addr, n) +#define __ide_mm_outsw(port, addr, n) io_outsw((unsigned int)port, addr, n) +#define __ide_mm_outsl(port, addr, n) io_outsl((unsigned int)port, addr, n) + +#endif /* CONFIG_MMU */ + #endif /* __KERNEL__ */ #endif /* _M68K_IDE_H */ |