Message ID | 1341821317-5173-2-git-send-email-bryan.wu@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 2fad434..94dbf74 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -149,7 +149,6 @@ CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y CONFIG_MFD_WM8994=y -CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 48e4f4e..124cb80 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -155,7 +155,6 @@ CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y CONFIG_MFD_WM8994=y -CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_ARMMMCI=m CONFIG_MMC_BLOCK=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index c678ef6..8c779df 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -106,7 +106,6 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set -CONFIG_MICREL_PHY=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MMC_ARMMMCI is not set CONFIG_MMC_SDHCI_PLTFM=y diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index ce8d9a8..03a5069 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -106,7 +106,6 @@ CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y CONFIG_MFD_WM8994=y -CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_ARMMMCI=m CONFIG_MMC_SDHCI_PLTFM=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6f0cc04..31f092f 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3225,6 +3225,7 @@ CONFIG_MFD_WM8400=y CONFIG_MG_DISK=m CONFIG_MG_DISK_RES=0 CONFIG_MICREL_KS8995MA=m +CONFIG_MICREL_PHY=y CONFIG_MICROCODE=m CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 98ae247..5224147 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -148,7 +148,6 @@ CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y CONFIG_MFD_WM8994=y -CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 387bed2..360429b 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -138,7 +138,6 @@ CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y CONFIG_MFD_WM8994=y -CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index d016e62..174854b 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -153,7 +153,6 @@ CONFIG_MFD_WM831X_I2C=y CONFIG_MFD_WM831X_SPI=y CONFIG_MFD_WM8350_I2C=y CONFIG_MFD_WM8994=y -CONFIG_MICREL_PHY=m CONFIG_MINIX_SUBPARTITION=y CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>