git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
au1000_eth.h
diff --git
a/drivers/net/au1000_eth.h
b/drivers/net/au1000_eth.h
index 41c2f848d2c421bd662a2002b0fd20e7c22fabf3..52fe00dd6d24d0402a878d87a70c0b6417b0f4a3 100644
(file)
--- a/
drivers/net/au1000_eth.h
+++ b/
drivers/net/au1000_eth.h
@@
-23,7
+23,7
@@
*
* ########################################################################
*
*
* ########################################################################
*
- *
+ *
*/
*/
@@
-40,8
+40,8
@@
#define MULTICAST_FILTER_LIMIT 64
#define MULTICAST_FILTER_LIMIT 64
-/*
- * Data Buffer Descriptor. Data buffers must be aligned on 32 byte
+/*
+ * Data Buffer Descriptor. Data buffers must be aligned on 32 byte
* boundary for both, receive and transmit.
*/
typedef struct db_dest {
* boundary for both, receive and transmit.
*/
typedef struct db_dest {
@@
-51,7
+51,7
@@
typedef struct db_dest {
} db_dest_t;
/*
} db_dest_t;
/*
- * The transmit and receive descriptors are memory
+ * The transmit and receive descriptors are memory
* mapped registers.
*/
typedef struct tx_dma {
* mapped registers.
*/
typedef struct tx_dma {
@@
-107,9
+107,9
@@
struct au1000_private {
struct phy_device *phy_dev;
struct mii_bus mii_bus;
struct phy_device *phy_dev;
struct mii_bus mii_bus;
-
+
/* These variables are just for quick access to certain regs addresses. */
/* These variables are just for quick access to certain regs addresses. */
- volatile mac_reg_t *mac; /* mac registers */
+ volatile mac_reg_t *mac; /* mac registers */
volatile u32 *enable; /* address of MAC Enable Register */
u32 vaddr; /* virtual address of rx/tx buffers */
volatile u32 *enable; /* address of MAC Enable Register */
u32 vaddr; /* virtual address of rx/tx buffers */