diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:27:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:27:10 -0700 |
| commit | 6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8 (patch) | |
| tree | 33e4072d5539741e775788eb7dd0ffcf84208d3b /arch/m68k | |
| parent | d9f5d41569731189e519fcee8578fcef5c916978 (diff) | |
| parent | 5e1c53356d79591b10cdea12e3d5ebace8e7b6fa (diff) | |
| download | linux-3.10-6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8.tar.gz linux-3.10-6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8.tar.bz2 linux-3.10-6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: include sched.h in ColdFire/SPI driver
m68knommu: formatting of pointers in printk()
m68knommu: arch/m68k/include/asm/ide.h fix for nommu
Diffstat (limited to 'arch/m68k')
| -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 3958726664b..492fee8a1ab 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 */ |