diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /arch/powerpc/configs/86xx/gef_sbc610_defconfig | |
| parent | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (diff) | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
| download | op-kernel-dev-aa2ba5f1082dc705745899584aac8416d710c056.zip op-kernel-dev-aa2ba5f1082dc705745899584aac8416d710c056.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'arch/powerpc/configs/86xx/gef_sbc610_defconfig')
| -rw-r--r-- | arch/powerpc/configs/86xx/gef_sbc610_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig index 2da13e0..07ccaf8 100644 --- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig @@ -838,7 +838,7 @@ CONFIG_PHYLIB=y # # MII PHY device drivers # -CONFIG_MARVELL_PHY=y +# CONFIG_MARVELL_PHY is not set # CONFIG_DAVICOM_PHY is not set # CONFIG_QSEMI_PHY is not set # CONFIG_LXT_PHY is not set |
