diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /drivers/net/ibm_emac | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/ibm_emac')
| -rw-r--r-- | drivers/net/ibm_emac/ibm_emac_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c index c7fb3675c09d..0de3bb906174 100644 --- a/drivers/net/ibm_emac/ibm_emac_core.c +++ b/drivers/net/ibm_emac/ibm_emac_core.c | |||
| @@ -1253,7 +1253,7 @@ static int emac_init_tah(struct ocp_enet_private *fep) | |||
| 1253 | TAH_MR_CVR | TAH_MR_ST_768 | TAH_MR_TFS_10KB | TAH_MR_DTFP | | 1253 | TAH_MR_CVR | TAH_MR_ST_768 | TAH_MR_TFS_10KB | TAH_MR_DTFP | |
| 1254 | TAH_MR_DIG); | 1254 | TAH_MR_DIG); |
| 1255 | 1255 | ||
| 1256 | iounmap(&tahp); | 1256 | iounmap(tahp); |
| 1257 | 1257 | ||
| 1258 | return 0; | 1258 | return 0; |
| 1259 | } | 1259 | } |