diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:53:19 -0700 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-30 14:34:35 -0700 |
| commit | 51c681bfd98e477fd3b2aca3aae612c9eea2a962 (patch) | |
| tree | 1034740b1c0f4758403ace3f2225d62b69b78ebd | |
| parent | 2af5da133baa84ac7b685778fbf36693796a0f56 (diff) | |
UBUNTU: [Config] Enable CONFIG_PATA_CMD640_PCI=m on powerpc
Per the non-modular module review, enable CONFIG_PATA_CMD640_PCI=m on
powerpc for consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -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 809a4856142..8ea62880ae4 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -157,7 +157,6 @@ CONFIG_NOP_USB_XCEIV=m CONFIG_NVRAM=m CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_PANEL_GENERIC_DPI=m -CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_OPTI=m CONFIG_PATA_SIS=y CONFIG_PCCARD=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 4bd98168d24..c84c0ff9933 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -142,7 +142,6 @@ CONFIG_NOP_USB_XCEIV=y CONFIG_NVRAM=m CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PANEL_GENERIC_DPI=y -CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_OPTI=m CONFIG_PATA_SIS=y # CONFIG_PCCARD is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 9110b74af92..80de39dafb5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3643,6 +3643,7 @@ CONFIG_PATA_ARASAN_CF=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m CONFIG_PATA_ATP867X=m +CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 7f7514f5c1f..aa1429c787a 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -157,7 +157,6 @@ CONFIG_NVRAM=m CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PANEL_GENERIC_DPI=m -CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_OPTI=m CONFIG_PATA_SIS=y CONFIG_PCCARD=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 9f46561b2ed..616562d80cc 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -139,7 +139,6 @@ CONFIG_NODES_SHIFT=8 CONFIG_NOP_USB_XCEIV=m CONFIG_NVRAM=y CONFIG_PANEL_GENERIC_DPI=m -# CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_OPTI is not set CONFIG_PATA_SIS=m CONFIG_PCCARD=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 1c5b5498287..351573cb53e 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -159,7 +159,6 @@ CONFIG_NODES_SHIFT=8 CONFIG_NOP_USB_XCEIV=m CONFIG_NR_CPUS=1024 CONFIG_PAGE_OFFSET=0xc000000000000000 -# CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_OPTI is not set CONFIG_PATA_SIS=m CONFIG_PCCARD=m |