diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /drivers/net/mace.c | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'drivers/net/mace.c')
| -rw-r--r-- | drivers/net/mace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 47d7850da47b..27c24eaa2414 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
| @@ -113,7 +113,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i | |||
| 113 | struct device_node *mace = macio_get_of_node(mdev); | 113 | struct device_node *mace = macio_get_of_node(mdev); |
| 114 | struct net_device *dev; | 114 | struct net_device *dev; |
| 115 | struct mace_data *mp; | 115 | struct mace_data *mp; |
| 116 | unsigned char *addr; | 116 | const unsigned char *addr; |
| 117 | int j, rev, rc = -EBUSY; | 117 | int j, rev, rc = -EBUSY; |
| 118 | 118 | ||
| 119 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { | 119 | if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { |