diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/asm-mips/mach-db1x00/db1x00.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/asm-mips/mach-db1x00/db1x00.h')
| -rw-r--r-- | include/asm-mips/mach-db1x00/db1x00.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h index 8fbb4b42a8b5..0f5f4c29f4e8 100644 --- a/include/asm-mips/mach-db1x00/db1x00.h +++ b/include/asm-mips/mach-db1x00/db1x00.h | |||
| @@ -30,8 +30,20 @@ | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | #ifdef CONFIG_MIPS_DB1550 | 32 | #ifdef CONFIG_MIPS_DB1550 |
| 33 | |||
| 34 | #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX | ||
| 35 | #define DBDMA_AC97_RX_CHAN DSCR_CMD0_PSC1_RX | ||
| 36 | #define DBDMA_I2S_TX_CHAN DSCR_CMD0_PSC3_TX | ||
| 37 | #define DBDMA_I2S_RX_CHAN DSCR_CMD0_PSC3_RX | ||
| 38 | |||
| 39 | #define SPI_PSC_BASE PSC0_BASE_ADDR | ||
| 40 | #define AC97_PSC_BASE PSC1_BASE_ADDR | ||
| 41 | #define SMBUS_PSC_BASE PSC2_BASE_ADDR | ||
| 42 | #define I2S_PSC_BASE PSC3_BASE_ADDR | ||
| 43 | |||
| 33 | #define BCSR_KSEG1_ADDR 0xAF000000 | 44 | #define BCSR_KSEG1_ADDR 0xAF000000 |
| 34 | #define NAND_PHYS_ADDR 0x20000000 | 45 | #define NAND_PHYS_ADDR 0x20000000 |
| 46 | |||
| 35 | #else | 47 | #else |
| 36 | #define BCSR_KSEG1_ADDR 0xAE000000 | 48 | #define BCSR_KSEG1_ADDR 0xAE000000 |
| 37 | #endif | 49 | #endif |