diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 21:54:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 21:54:16 -0700 |
| commit | 8e268f333012c62fc6a5a10e1e2a19c1c389853e (patch) | |
| tree | caa132b137e1d65c7cf42a37ac23bfad41c3d6e1 /include/asm-sh64/io.h | |
| parent | cbdd3deb52ac9b013a63e4a60530717f75ce3177 (diff) | |
| parent | 75c46162be3d0025d448e0b738d6f8b51ff8a6e5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Kill off virt_to_bus()/bus_to_virt().
sh64: Fix irq_intc build failure.
sh64: Fix fs.h removal from mm.h regressions.
Diffstat (limited to 'include/asm-sh64/io.h')
| -rw-r--r-- | include/asm-sh64/io.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h index 14d8e7b4bf4..1f37b693192 100644 --- a/include/asm-sh64/io.h +++ b/include/asm-sh64/io.h @@ -31,10 +31,6 @@ #include <asm/page.h> #include <asm-generic/iomap.h> -#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virt -#define page_to_bus page_to_phys - /* * Nothing overly special here.. instead of doing the same thing * over and over again, we just define a set of sh64_in/out functions |