can: sja1000 platform data fixes

[safe/jmp/linux-2.6] / drivers / net / ll_temac.h

diff --git a/drivers/net/ll_temac.h b/drivers/net/ll_temac.h
index 1af66a1..c033584 100644 (file)
--- a/drivers/net/ll_temac.h
+++ b/drivers/net/ll_temac.h
@@ -5,8 +5,11 @@
 #include <linux/netdevice.h>
 #include <linux/of.h>
 #include <linux/spinlock.h>
+
+#ifdef CONFIG_PPC_DCR
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
+#endif
 
 /* packet size info */
 #define XTE_HDR_SIZE                   14      /* size of Ethernet header */
@@ -290,9 +293,6 @@ This option defaults to enabled (set) */
 
 #define TX_CONTROL_CALC_CSUM_MASK   1
 
-#define XTE_ALIGN       32
-#define BUFFER_ALIGN(adr) ((XTE_ALIGN - ((u32) adr)) % XTE_ALIGN)
-
 #define MULTICAST_CAM_TABLE_NUM 4
 
 /* TX/RX CURDESC_PTR points to first descriptor */
@@ -335,9 +335,15 @@ struct temac_local {
        struct mii_bus *mii_bus;        /* MII bus reference */
        int mdio_irqs[PHY_MAX_ADDR];    /* IRQs table for MDIO bus */
 
-       /* IO registers and IRQs */
+       /* IO registers, dma functions and IRQs */
        void __iomem *regs;
+       void __iomem *sdma_regs;
+#ifdef CONFIG_PPC_DCR
        dcr_host_t sdma_dcrs;
+#endif
+       u32 (*dma_in)(struct temac_local *, int);
+       void (*dma_out)(struct temac_local *, int, u32);
+
        int tx_irq;
        int rx_irq;
        int emac_num;