diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-18 03:36:46 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-18 03:36:46 -0400 |
| commit | 0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d (patch) | |
| tree | 9b9337ae627fc56a0eda43c60860765f25efaa0b /include/asm-arm/arch-versatile/platform.h | |
| parent | 1c3f45ab2f7f879ea482501c83899505c31f7539 (diff) | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/arch-versatile/platform.h')
| -rw-r--r-- | include/asm-arm/arch-versatile/platform.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/asm-arm/arch-versatile/platform.h b/include/asm-arm/arch-versatile/platform.h index 2598d1f08548..a71093e44c58 100644 --- a/include/asm-arm/arch-versatile/platform.h +++ b/include/asm-arm/arch-versatile/platform.h | |||
| @@ -498,11 +498,17 @@ | |||
| 498 | /* | 498 | /* |
| 499 | * IB2 Versatile/AB expansion board definitions | 499 | * IB2 Versatile/AB expansion board definitions |
| 500 | */ | 500 | */ |
| 501 | #define VERSATILE_IB2_CAMERA_BANK 0x24000000 | 501 | #define VERSATILE_IB2_CAMERA_BANK VERSATILE_IB2_BASE |
| 502 | #define VERSATILE_IB2_KBD_DATAREG 0x25000000 | 502 | #define VERSATILE_IB2_KBD_DATAREG (VERSATILE_IB2_BASE + 0x01000000) |
| 503 | #define VERSATILE_IB2_IER 0x26000000 /* for VICINTSOURCE27 */ | 503 | |
| 504 | #define VERSATILE_IB2_CTRL 0x27000000 | 504 | /* VICINTSOURCE27 */ |
| 505 | #define VERSATILE_IB2_STAT 0x27000004 | 505 | #define VERSATILE_IB2_INT_BASE (VERSATILE_IB2_BASE + 0x02000000) |
| 506 | #define VERSATILE_IB2_IER (VERSATILE_IB2_INT_BASE + 0) | ||
| 507 | #define VERSATILE_IB2_ISR (VERSATILE_IB2_INT_BASE + 4) | ||
| 508 | |||
| 509 | #define VERSATILE_IB2_CTL_BASE (VERSATILE_IB2_BASE + 0x03000000) | ||
| 510 | #define VERSATILE_IB2_CTRL (VERSATILE_IB2_CTL_BASE + 0) | ||
| 511 | #define VERSATILE_IB2_STAT (VERSATILE_IB2_CTL_BASE + 4) | ||
| 506 | #endif | 512 | #endif |
| 507 | 513 | ||
| 508 | #endif | 514 | #endif |