Преглед на файлове

Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

Paul Mackerras преди 16 години
родител
ревизия
ab44f4627e
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      arch/powerpc/configs/83xx/mpc834x_itx_defconfig
  2. 1 1
      arch/powerpc/configs/mpc83xx_defconfig

+ 1 - 1
arch/powerpc/configs/83xx/mpc834x_itx_defconfig

@@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # 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 is not set
 CONFIG_NETDEV_1000=y

+ 1 - 1
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