diff options
Diffstat (limited to 'drivers/net/ll_temac.h')
-rw-r--r-- | drivers/net/ll_temac.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/ll_temac.h b/drivers/net/ll_temac.h index c03358434acb..1af66a1e6911 100644 --- a/drivers/net/ll_temac.h +++ b/drivers/net/ll_temac.h | |||
@@ -5,11 +5,8 @@ | |||
5 | #include <linux/netdevice.h> | 5 | #include <linux/netdevice.h> |
6 | #include <linux/of.h> | 6 | #include <linux/of.h> |
7 | #include <linux/spinlock.h> | 7 | #include <linux/spinlock.h> |
8 | |||
9 | #ifdef CONFIG_PPC_DCR | ||
10 | #include <asm/dcr.h> | 8 | #include <asm/dcr.h> |
11 | #include <asm/dcr-regs.h> | 9 | #include <asm/dcr-regs.h> |
12 | #endif | ||
13 | 10 | ||
14 | /* packet size info */ | 11 | /* packet size info */ |
15 | #define XTE_HDR_SIZE 14 /* size of Ethernet header */ | 12 | #define XTE_HDR_SIZE 14 /* size of Ethernet header */ |
@@ -293,6 +290,9 @@ This option defaults to enabled (set) */ | |||
293 | 290 | ||
294 | #define TX_CONTROL_CALC_CSUM_MASK 1 | 291 | #define TX_CONTROL_CALC_CSUM_MASK 1 |
295 | 292 | ||
293 | #define XTE_ALIGN 32 | ||
294 | #define BUFFER_ALIGN(adr) ((XTE_ALIGN - ((u32) adr)) % XTE_ALIGN) | ||
295 | |||
296 | #define MULTICAST_CAM_TABLE_NUM 4 | 296 | #define MULTICAST_CAM_TABLE_NUM 4 |
297 | 297 | ||
298 | /* TX/RX CURDESC_PTR points to first descriptor */ | 298 | /* TX/RX CURDESC_PTR points to first descriptor */ |
@@ -335,15 +335,9 @@ struct temac_local { | |||
335 | struct mii_bus *mii_bus; /* MII bus reference */ | 335 | struct mii_bus *mii_bus; /* MII bus reference */ |
336 | int mdio_irqs[PHY_MAX_ADDR]; /* IRQs table for MDIO bus */ | 336 | int mdio_irqs[PHY_MAX_ADDR]; /* IRQs table for MDIO bus */ |
337 | 337 | ||
338 | /* IO registers, dma functions and IRQs */ | 338 | /* IO registers and IRQs */ |
339 | void __iomem *regs; | 339 | void __iomem *regs; |
340 | void __iomem *sdma_regs; | ||
341 | #ifdef CONFIG_PPC_DCR | ||
342 | dcr_host_t sdma_dcrs; | 340 | dcr_host_t sdma_dcrs; |
343 | #endif | ||
344 | u32 (*dma_in)(struct temac_local *, int); | ||
345 | void (*dma_out)(struct temac_local *, int, u32); | ||
346 | |||
347 | int tx_irq; | 341 | int tx_irq; |
348 | int rx_irq; | 342 | int rx_irq; |
349 | int emac_num; | 343 | int emac_num; |