UBUNTU: [Config] Enable CONFIG_VITESSE_PHY=y

Per the Precise Rally config review, enable CONFIG_VITESSE_PHY=y as PHY
drivers are not autoloadable.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c047a84..94bee29 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -301,7 +301,6 @@ CONFIG_VIDEO_TVAUDIO=m
 # CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
-CONFIG_VITESSE_PHY=y
 CONFIG_VME_BUS=m
 CONFIG_VME_CA91CX42=m
 CONFIG_VME_TSI148=m

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 28f61ff..c0358ec 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -287,7 +287,6 @@ CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
-CONFIG_VITESSE_PHY=y
 CONFIG_VME_BUS=m
 # CONFIG_VME_CA91CX42 is not set
 # CONFIG_VME_TSI148 is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 4901481..b606e3c 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -214,7 +214,6 @@ CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_RING=m
-CONFIG_VITESSE_PHY=y
 # CONFIG_VT6656 is not set
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_W35UND=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bce485a..97cfbde 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5909,6 +5909,7 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRT_TO_BUS=y
+CONFIG_VITESSE_PHY=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLSI_FIR=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index af74c2a..eec777d 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -299,7 +299,6 @@ CONFIG_VIDEO_TVAUDIO=m
 # CONFIG_VIDEO_TVP514X is not set
 CONFIG_VIDEO_TVP5150=m
 CONFIG_VIDEO_VPX3220=m
-CONFIG_VITESSE_PHY=y
 CONFIG_VME_BUS=m
 CONFIG_VME_CA91CX42=m
 CONFIG_VME_TSI148=m

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 02f414e..420c9aa 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -285,7 +285,6 @@ CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
-CONFIG_VITESSE_PHY=m
 # CONFIG_VME_BUS is not set
 # CONFIG_VT6656 is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y

diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 7945163..1933d0d 100644 (file)
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -322,7 +322,6 @@ CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=m
 CONFIG_VIRTIO_RING=m
-CONFIG_VITESSE_PHY=m
 # CONFIG_VME_BUS is not set
 # CONFIG_VT6656 is not set
 CONFIG_VT_HW_CONSOLE_BINDING=y