diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /drivers/net/fs_enet | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/fs_enet')
| -rw-r--r-- | drivers/net/fs_enet/mac-scc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index 5ff856d7590b..fe3d8a621c33 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
| @@ -149,7 +149,7 @@ static int setup_data(struct net_device *dev) | |||
| 149 | { | 149 | { |
| 150 | struct fs_enet_private *fep = netdev_priv(dev); | 150 | struct fs_enet_private *fep = netdev_priv(dev); |
| 151 | 151 | ||
| 152 | #ifdef CONFIG_PPC_CPM_NEW_BINDING | 152 | #ifndef CONFIG_PPC_CPM_NEW_BINDING |
| 153 | struct fs_platform_info *fpi = fep->fpi; | 153 | struct fs_platform_info *fpi = fep->fpi; |
| 154 | 154 | ||
| 155 | fep->scc.idx = fs_get_scc_index(fpi->fs_no); | 155 | fep->scc.idx = fs_get_scc_index(fpi->fs_no); |