diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-14 00:46:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-14 00:46:50 -0500 |
| commit | 280bb6b1f76aaec29a721b1025ec5d69afba57e8 (patch) | |
| tree | 769284bd2000bb80e49a6d23df61e3fedc947c64 /drivers | |
| parent | eb8dc843fc3c0dbac553ec79d7e5b4d8339aeb3d (diff) | |
| parent | c89686210542f6946e48a907772a356b9fce03f0 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'drivers')
| -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 03134f47a4eb..48f2f3005935 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
| @@ -158,7 +158,7 @@ static int setup_data(struct net_device *dev) | |||
| 158 | { | 158 | { |
| 159 | struct fs_enet_private *fep = netdev_priv(dev); | 159 | struct fs_enet_private *fep = netdev_priv(dev); |
| 160 | 160 | ||
| 161 | #ifdef CONFIG_PPC_CPM_NEW_BINDING | 161 | #ifndef CONFIG_PPC_CPM_NEW_BINDING |
| 162 | struct fs_platform_info *fpi = fep->fpi; | 162 | struct fs_platform_info *fpi = fep->fpi; |
| 163 | 163 | ||
| 164 | fep->scc.idx = fs_get_scc_index(fpi->fs_no); | 164 | fep->scc.idx = fs_get_scc_index(fpi->fs_no); |