lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linux-2.6'

Browse Source
This commit is contained in:
Paul Mackerras
2007-12-21 22:21:08 +11:00
parent 373a6da165 ea67db4cdb
commit c2a7dcad9f
367 changed files with 4090 additions and 2766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/fs_enet/mac-scc.c
View File

@ -149,7 +149,7 @@ static int setup_data(struct net_device *dev)
{
struct fs_enet_private *fep = netdev_priv(dev);
#ifdef CONFIG_PPC_CPM_NEW_BINDING
#ifndef CONFIG_PPC_CPM_NEW_BINDING
struct fs_platform_info *fpi = fep->fpi;
fep->scc.idx = fs_get_scc_index(fpi->fs_no);