diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-sh64/io.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
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 14d8e7b4bf4b..1f37b6931922 100644 --- a/include/asm-sh64/io.h +++ b/include/asm-sh64/io.h | |||
| @@ -31,10 +31,6 @@ | |||
| 31 | #include <asm/page.h> | 31 | #include <asm/page.h> |
| 32 | #include <asm-generic/iomap.h> | 32 | #include <asm-generic/iomap.h> |
| 33 | 33 | ||
| 34 | #define virt_to_bus virt_to_phys | ||
| 35 | #define bus_to_virt phys_to_virt | ||
| 36 | #define page_to_bus page_to_phys | ||
| 37 | |||
| 38 | /* | 34 | /* |
| 39 | * Nothing overly special here.. instead of doing the same thing | 35 | * Nothing overly special here.. instead of doing the same thing |
| 40 | * over and over again, we just define a set of sh64_in/out functions | 36 | * over and over again, we just define a set of sh64_in/out functions |