diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /drivers/net/arm/ep93xx_eth.c | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'drivers/net/arm/ep93xx_eth.c')
| -rw-r--r-- | drivers/net/arm/ep93xx_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 41736772c1dd..b72b3d639f6e 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
| @@ -153,7 +153,7 @@ struct ep93xx_descs | |||
| 153 | struct ep93xx_priv | 153 | struct ep93xx_priv |
| 154 | { | 154 | { |
| 155 | struct resource *res; | 155 | struct resource *res; |
| 156 | void *base_addr; | 156 | void __iomem *base_addr; |
| 157 | int irq; | 157 | int irq; |
| 158 | 158 | ||
| 159 | struct ep93xx_descs *descs; | 159 | struct ep93xx_descs *descs; |