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-powerpc/dcr-mmio.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-powerpc/dcr-mmio.h')
| -rw-r--r-- | include/asm-powerpc/dcr-mmio.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-powerpc/dcr-mmio.h b/include/asm-powerpc/dcr-mmio.h index 5dbfca8dde36..6b82c3ba495a 100644 --- a/include/asm-powerpc/dcr-mmio.h +++ b/include/asm-powerpc/dcr-mmio.h | |||
| @@ -23,7 +23,11 @@ | |||
| 23 | 23 | ||
| 24 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 25 | 25 | ||
| 26 | typedef struct { void __iomem *token; unsigned int stride; } dcr_host_t; | 26 | typedef struct { |
| 27 | void __iomem *token; | ||
| 28 | unsigned int stride; | ||
| 29 | unsigned int base; | ||
| 30 | } dcr_host_t; | ||
| 27 | 31 | ||
| 28 | #define DCR_MAP_OK(host) ((host).token != NULL) | 32 | #define DCR_MAP_OK(host) ((host).token != NULL) |
| 29 | 33 | ||