dma/ia64: update ia64 machvecs, swiotlb.c

[safe/jmp/linux-2.6] / include / asm-powerpc / ucc_slow.h

diff --git a/include/asm-powerpc/ucc_slow.h b/include/asm-powerpc/ucc_slow.h
index 1babad9..0980e6a 100644 (file)
--- a/include/asm-powerpc/ucc_slow.h
+++ b/include/asm-powerpc/ucc_slow.h
@@ -148,9 +148,10 @@ enum ucc_slow_diag_mode {
 
 struct ucc_slow_info {
        int ucc_num;
+       int protocol;                   /* QE_CR_PROTOCOL_xxx */
        enum qe_clock rx_clock;
        enum qe_clock tx_clock;
-       struct ucc_slow *regs;
+       phys_addr_t regs;
        int irq;
        u16 uccm_mask;
        int data_mem_part;
@@ -186,7 +187,7 @@ struct ucc_slow_info {
 
 struct ucc_slow_private {
        struct ucc_slow_info *us_info;
-       struct ucc_slow *us_regs;       /* a pointer to memory map of UCC regs */
+       struct ucc_slow __iomem *us_regs; /* Ptr to memory map of UCC regs */
        struct ucc_slow_pram *us_pram;  /* a pointer to the parameter RAM */
        u32 us_pram_offset;
        int enabled_tx;         /* Whether channel is enabled for Tx (ENT) */
@@ -199,9 +200,9 @@ struct ucc_slow_private {
                                   and length for first BD in a frame */
        u32 tx_base_offset;     /* first BD in Tx BD table offset (In MURAM) */
        u32 rx_base_offset;     /* first BD in Rx BD table offset (In MURAM) */
-       u8 *confBd;             /* next BD for confirm after Tx */
-       u8 *tx_bd;              /* next BD for new Tx request */
-       u8 *rx_bd;              /* next BD to collect after Rx */
+       struct qe_bd *confBd;   /* next BD for confirm after Tx */
+       struct qe_bd *tx_bd;    /* next BD for new Tx request */
+       struct qe_bd *rx_bd;    /* next BD to collect after Rx */
        void *p_rx_frame;       /* accumulating receive frame */
        u16 *p_ucce;            /* a pointer to the event register in memory.
                                 */
@@ -277,12 +278,12 @@ void ucc_slow_graceful_stop_tx(struct ucc_slow_private * uccs);
  */
 void ucc_slow_stop_tx(struct ucc_slow_private * uccs);
 
-/* ucc_slow_restart_x
+/* ucc_slow_restart_tx
  * Restarts transmitting on a specified slow UCC.
  *
  * uccs - (In) pointer to the slow UCC structure.
  */
-void ucc_slow_restart_x(struct ucc_slow_private * uccs);
+void ucc_slow_restart_tx(struct ucc_slow_private *uccs);
 
 u32 ucc_slow_get_qe_cr_subblock(int uccs_num);