summaryrefslogtreecommitdiff
path: root/arch/powerpc/configs/mpc83xx_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-25 15:51:46 +0300
committerIngo Molnar <mingo@elte.hu>2008-12-25 15:51:46 +0300
commit0b271ef4521756010675b1611bef20fd3096790d (patch)
tree2c9d22a2c74122a9904e533df27f41d63ffef394 /arch/powerpc/configs/mpc83xx_defconfig
parentb19b3c74c7bbec45a848631b8f970ac110665a01 (diff)
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff)
downloadlinux-0b271ef4521756010675b1611bef20fd3096790d.tar.xz
Merge commit 'v2.6.28' into core/core
Diffstat (limited to 'arch/powerpc/configs/mpc83xx_defconfig')
-rw-r--r--arch/powerpc/configs/mpc83xx_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 15eb30c9b3f9..d582014b0a38 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y
# CONFIG_BROADCOM_PHY is not set
CONFIG_ICPLUS_PHY=y
# CONFIG_REALTEK_PHY is not set
-# CONFIG_FIXED_PHY is not set
+CONFIG_FIXED_PHY=y
# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=y