diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2014-11-21 18:16:48 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-11-24 16:46:44 -0500 |
commit | 34adb28d500e644cc260da4ceb66ba6dc0beaf93 (patch) | |
tree | d47596d498c031e9140f7fca3a5bc8b4a393a08d /drivers/dma/txx9dmac.h | |
parent | f98614072c5d43421a2cfa6f9b911a071e6e6d5f (diff) |
MIPS: Replace MIPS-specific 64BIT_PHYS_ADDR with generic PHYS_ADDR_T_64BIT
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/dma/txx9dmac.h')
-rw-r--r-- | drivers/dma/txx9dmac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/txx9dmac.h b/drivers/dma/txx9dmac.h index f5a760598882..f6517b928bab 100644 --- a/drivers/dma/txx9dmac.h +++ b/drivers/dma/txx9dmac.h | |||
@@ -67,7 +67,7 @@ static inline bool txx9_dma_have_SMPCHN(void) | |||
67 | 67 | ||
68 | /* Hardware register definitions. */ | 68 | /* Hardware register definitions. */ |
69 | struct txx9dmac_cregs { | 69 | struct txx9dmac_cregs { |
70 | #if defined(CONFIG_32BIT) && !defined(CONFIG_64BIT_PHYS_ADDR) | 70 | #if defined(CONFIG_32BIT) && !defined(CONFIG_PHYS_ADDR_T_64BIT) |
71 | TXX9_DMA_REG32(CHAR); /* Chain Address Register */ | 71 | TXX9_DMA_REG32(CHAR); /* Chain Address Register */ |
72 | #else | 72 | #else |
73 | u64 CHAR; /* Chain Address Register */ | 73 | u64 CHAR; /* Chain Address Register */ |
@@ -201,7 +201,7 @@ static inline bool is_dmac64(const struct txx9dmac_chan *dc) | |||
201 | #ifdef TXX9_DMA_USE_SIMPLE_CHAIN | 201 | #ifdef TXX9_DMA_USE_SIMPLE_CHAIN |
202 | /* Hardware descriptor definition. (for simple-chain) */ | 202 | /* Hardware descriptor definition. (for simple-chain) */ |
203 | struct txx9dmac_hwdesc { | 203 | struct txx9dmac_hwdesc { |
204 | #if defined(CONFIG_32BIT) && !defined(CONFIG_64BIT_PHYS_ADDR) | 204 | #if defined(CONFIG_32BIT) && !defined(CONFIG_PHYS_ADDR_T_64BIT) |
205 | TXX9_DMA_REG32(CHAR); | 205 | TXX9_DMA_REG32(CHAR); |
206 | #else | 206 | #else |
207 | u64 CHAR; | 207 | u64 CHAR; |