diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-24 12:40:02 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:57:49 -0600 |
| commit | c3aebe86370b49c35202a864352cae54965b9612 (patch) | |
| tree | b648ce1a52a4a5c32c584cc6a971e7f358da13a7 /debian.master | |
| parent | 09d51d5333ebe9e3b0de12f732c7dd1853808a16 (diff) | |
UBUNTU: [Config] Enable CONFIG_IDE_PHISON=m on powerpc
Per the non-modular module review, enable CONFIG_IDE_PHISON=m on powerpc
for consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
6 files changed, 1 insertions, 5 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index a4fce196533..12f8095c7b1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -109,7 +109,6 @@ CONFIG_I2C_I801=m # CONFIG_I2C_PXA_PCI is not set CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set -CONFIG_IDE_PHISON=m CONFIG_IGB=m CONFIG_IIO=m CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 43ec1ef879a..f4fd27e5a33 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -101,7 +101,6 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_PXA_PCI is not set CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set -CONFIG_IDE_PHISON=m CONFIG_IGB=m CONFIG_IIO=m # CONFIG_INTR_REMAP is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 2e66500fc10..b79366c78bc 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2125,6 +2125,7 @@ CONFIG_IDE_ATAPI=y CONFIG_IDE_GD=y CONFIG_IDE_GD_ATA=y # CONFIG_IDE_GD_ATAPI is not set +CONFIG_IDE_PHISON=m CONFIG_IDE_PROC_FS=y # CONFIG_IDE_TASK_IOCTL is not set CONFIG_IDE_TIMINGS=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 789d6c28521..6664c4929be 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -109,7 +109,6 @@ CONFIG_I2C_GPIO=m CONFIG_I2C_I801=m CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set -CONFIG_IDE_PHISON=m CONFIG_IGB=m CONFIG_IIO=m CONFIG_ILLEGAL_POINTER_VALUE=0 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 984900e3c4b..3ecb06919d6 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -97,7 +97,6 @@ CONFIG_I2C_I801=m # CONFIG_IBMEBUS is not set CONFIG_ICPLUS_PHY=m CONFIG_IDE=y -# CONFIG_IDE_PHISON is not set # CONFIG_IGB is not set # CONFIG_IIO is not set CONFIG_IOMMU_HELPER=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 0bc19059af9..feff9650fb8 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -110,7 +110,6 @@ CONFIG_I2C_I801=m CONFIG_IBMEBUS=y CONFIG_ICPLUS_PHY=m CONFIG_IDE=y -# CONFIG_IDE_PHISON is not set # CONFIG_IGB is not set # CONFIG_IIO is not set CONFIG_IOMMU_HELPER=y |