Message ID | 1269002779-11113-2-git-send-email-apw@canonical.com |
---|---|
State | Accepted |
Delegated to: | Andy Whitcroft |
Headers | show |
Seems ok from looking over them. And also seems to make the config a bit more common over the board. Andy Whitcroft wrote: > CONFIG_PATA_ALI=m > CONFIG_PATA_AMD=m > CONFIG_PATA_ARTOP=m > CONFIG_PATA_ATIIXP=m > CONFIG_PATA_CMD640_PCI=m > CONFIG_PATA_CMD64X=m > CONFIG_PATA_CS5520=m > CONFIG_PATA_CS5530=m > CONFIG_PATA_CS5536=m > CONFIG_PATA_EFAR=m > CONFIG_PATA_HPT366=m > CONFIG_PATA_HPT37X=m > CONFIG_PATA_HPT3X2N=m > CONFIG_PATA_HPT3X3=m > CONFIG_PATA_IT821X=m > CONFIG_PATA_JMICRON=m > CONFIG_PATA_MARVELL=m > CONFIG_PATA_MPIIX=m > CONFIG_PATA_NETCELL=m > CONFIG_PATA_NS87410=m > CONFIG_PATA_NS87415=m > CONFIG_PATA_OLDPIIX=m > CONFIG_PATA_PDC2027X=m > CONFIG_PATA_PDC_OLD=m > CONFIG_PATA_QDI=m > CONFIG_PATA_RZ1000=m > CONFIG_PATA_SC1200=m > CONFIG_PATA_SCH=m > CONFIG_PATA_SERVERWORKS=m > CONFIG_PATA_SIL680=m > CONFIG_PATA_TRIFLEX=m > CONFIG_PATA_VIA=m > CONFIG_PATA_WINBOND=m > > Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian.master/config/amd64/config.common.amd64 | 4 -- > debian.master/config/armel/config.common.armel | 4 -- > debian.master/config/config.common.ubuntu | 62 +++++++++++++----------- > debian.master/config/i386/config.common.i386 | 4 -- > debian.master/config/lpia/config.common.lpia | 4 -- > 5 files changed, 33 insertions(+), 45 deletions(-) > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 > index 69c6361..a8b3906 100644 > --- a/debian.master/config/amd64/config.common.amd64 > +++ b/debian.master/config/amd64/config.common.amd64 > @@ -99,10 +99,6 @@ CONFIG_NO_HZ=y > CONFIG_NR_CPUS=64 > CONFIG_OUTPUT_FORMAT="elf64-x86-64" > CONFIG_PARPORT=m > -CONFIG_PATA_CMD640_PCI=m > -CONFIG_PATA_HPT37X=y > -CONFIG_PATA_HPT3X2N=m > -CONFIG_PATA_OLDPIIX=y > CONFIG_PCCARD=m > CONFIG_PHYSICAL_ALIGN=0x1000000 > CONFIG_PHYSICAL_START=0x200000 > diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel > index 06fdc5b..a0a5159 100644 > --- a/debian.master/config/armel/config.common.armel > +++ b/debian.master/config/armel/config.common.armel > @@ -83,10 +83,6 @@ CONFIG_MTD_GEN_PROBE=y > # CONFIG_NFTL is not set > # CONFIG_NO_HZ is not set > # CONFIG_PARPORT is not set > -# CONFIG_PATA_CMD640_PCI is not set > -# CONFIG_PATA_HPT37X is not set > -# CONFIG_PATA_HPT3X2N is not set > -# CONFIG_PATA_OLDPIIX is not set > # CONFIG_PCCARD is not set > # CONFIG_PHYS_ADDR_T_64BIT is not set > # CONFIG_PM_DEBUG is not set > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 701d7d5..2ea2383 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -2740,49 +2740,53 @@ CONFIG_PARPORT_PC_PCMCIA=m > CONFIG_PARPORT_SERIAL=m > CONFIG_PARTITION_ADVANCED=y > CONFIG_PATA_ACPI=y > -CONFIG_PATA_ALI=y > -CONFIG_PATA_AMD=y > -CONFIG_PATA_ARTOP=y > -CONFIG_PATA_ATIIXP=y > +CONFIG_PATA_ALI=m > +CONFIG_PATA_AMD=m > +CONFIG_PATA_ARTOP=m > +CONFIG_PATA_ATIIXP=m > CONFIG_PATA_ATP867X=m > -CONFIG_PATA_CMD64X=y > -CONFIG_PATA_CS5520=y > -CONFIG_PATA_CS5530=y > +CONFIG_PATA_CMD640_PCI=m > +CONFIG_PATA_CMD64X=m > +CONFIG_PATA_CS5520=m > +CONFIG_PATA_CS5530=m > CONFIG_PATA_CS5535=m > -CONFIG_PATA_CS5536=y > +CONFIG_PATA_CS5536=m > CONFIG_PATA_CYPRESS=m > -CONFIG_PATA_EFAR=y > -CONFIG_PATA_HPT366=y > -CONFIG_PATA_HPT3X3=y > +CONFIG_PATA_EFAR=m > +CONFIG_PATA_HPT366=m > +CONFIG_PATA_HPT37X=m > +CONFIG_PATA_HPT3X2N=m > +CONFIG_PATA_HPT3X3=m > # CONFIG_PATA_HPT3X3_DMA is not set > CONFIG_PATA_ISAPNP=m > CONFIG_PATA_IT8213=m > -CONFIG_PATA_IT821X=y > -CONFIG_PATA_JMICRON=y > +CONFIG_PATA_IT821X=m > +CONFIG_PATA_JMICRON=m > CONFIG_PATA_LEGACY=m > -CONFIG_PATA_MARVELL=y > -CONFIG_PATA_MPIIX=y > -CONFIG_PATA_NETCELL=y > +CONFIG_PATA_MARVELL=m > +CONFIG_PATA_MPIIX=m > +CONFIG_PATA_NETCELL=m > CONFIG_PATA_NINJA32=m > -CONFIG_PATA_NS87410=y > -CONFIG_PATA_NS87415=y > +CONFIG_PATA_NS87410=m > +CONFIG_PATA_NS87415=m > +CONFIG_PATA_OLDPIIX=m > CONFIG_PATA_OPTI=m > CONFIG_PATA_OPTIDMA=m > CONFIG_PATA_PCMCIA=m > -CONFIG_PATA_PDC2027X=y > -CONFIG_PATA_PDC_OLD=y > -CONFIG_PATA_QDI=y > +CONFIG_PATA_PDC2027X=m > +CONFIG_PATA_PDC_OLD=m > +CONFIG_PATA_QDI=m > CONFIG_PATA_RADISYS=m > CONFIG_PATA_RDC=m > -CONFIG_PATA_RZ1000=y > -CONFIG_PATA_SC1200=y > -CONFIG_PATA_SCH=y > -CONFIG_PATA_SERVERWORKS=y > -CONFIG_PATA_SIL680=y > +CONFIG_PATA_RZ1000=m > +CONFIG_PATA_SC1200=m > +CONFIG_PATA_SCH=m > +CONFIG_PATA_SERVERWORKS=m > +CONFIG_PATA_SIL680=m > CONFIG_PATA_SIS=y > -CONFIG_PATA_TRIFLEX=y > -CONFIG_PATA_VIA=y > -CONFIG_PATA_WINBOND=y > +CONFIG_PATA_TRIFLEX=m > +CONFIG_PATA_VIA=m > +CONFIG_PATA_WINBOND=m > CONFIG_PATA_WINBOND_VLB=m > # CONFIG_PC300TOO is not set > CONFIG_PC8736x_GPIO=m > diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 > index 440a8bd..e1ee049 100644 > --- a/debian.master/config/i386/config.common.i386 > +++ b/debian.master/config/i386/config.common.i386 > @@ -97,10 +97,6 @@ CONFIG_NO_HZ=y > CONFIG_NR_CPUS=8 > CONFIG_OUTPUT_FORMAT="elf32-i386" > CONFIG_PARPORT=m > -CONFIG_PATA_CMD640_PCI=y > -CONFIG_PATA_HPT37X=m > -CONFIG_PATA_HPT3X2N=y > -CONFIG_PATA_OLDPIIX=m > CONFIG_PCCARD=m > CONFIG_PHYSICAL_ALIGN=0x100000 > CONFIG_PHYSICAL_START=0x100000 > diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia > index b043480..816b7dd 100644 > --- a/debian.master/config/lpia/config.common.lpia > +++ b/debian.master/config/lpia/config.common.lpia > @@ -106,10 +106,6 @@ CONFIG_NO_HZ=y > CONFIG_NR_CPUS=8 > CONFIG_OUTPUT_FORMAT="elf32-i386" > CONFIG_PARPORT=m > -CONFIG_PATA_CMD640_PCI=y > -CONFIG_PATA_HPT37X=m > -CONFIG_PATA_HPT3X2N=y > -CONFIG_PATA_OLDPIIX=m > CONFIG_PCCARD=m > CONFIG_PHYSICAL_ALIGN=0x100000 > CONFIG_PHYSICAL_START=0x100000
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 69c6361..a8b3906 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -99,10 +99,6 @@ CONFIG_NO_HZ=y CONFIG_NR_CPUS=64 CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_PARPORT=m -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_HPT37X=y -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_OLDPIIX=y CONFIG_PCCARD=m CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_PHYSICAL_START=0x200000 diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 06fdc5b..a0a5159 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -83,10 +83,6 @@ CONFIG_MTD_GEN_PROBE=y # CONFIG_NFTL is not set # CONFIG_NO_HZ is not set # CONFIG_PARPORT is not set -# CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_HPT37X is not set -# CONFIG_PATA_HPT3X2N is not set -# CONFIG_PATA_OLDPIIX is not set # CONFIG_PCCARD is not set # CONFIG_PHYS_ADDR_T_64BIT is not set # CONFIG_PM_DEBUG is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 701d7d5..2ea2383 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2740,49 +2740,53 @@ CONFIG_PARPORT_PC_PCMCIA=m CONFIG_PARPORT_SERIAL=m CONFIG_PARTITION_ADVANCED=y CONFIG_PATA_ACPI=y -CONFIG_PATA_ALI=y -CONFIG_PATA_AMD=y -CONFIG_PATA_ARTOP=y -CONFIG_PATA_ATIIXP=y +CONFIG_PATA_ALI=m +CONFIG_PATA_AMD=m +CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATIIXP=m CONFIG_PATA_ATP867X=m -CONFIG_PATA_CMD64X=y -CONFIG_PATA_CS5520=y -CONFIG_PATA_CS5530=y +CONFIG_PATA_CMD640_PCI=m +CONFIG_PATA_CMD64X=m +CONFIG_PATA_CS5520=m +CONFIG_PATA_CS5530=m CONFIG_PATA_CS5535=m -CONFIG_PATA_CS5536=y +CONFIG_PATA_CS5536=m CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=y -CONFIG_PATA_HPT366=y -CONFIG_PATA_HPT3X3=y +CONFIG_PATA_EFAR=m +CONFIG_PATA_HPT366=m +CONFIG_PATA_HPT37X=m +CONFIG_PATA_HPT3X2N=m +CONFIG_PATA_HPT3X3=m # CONFIG_PATA_HPT3X3_DMA is not set CONFIG_PATA_ISAPNP=m CONFIG_PATA_IT8213=m -CONFIG_PATA_IT821X=y -CONFIG_PATA_JMICRON=y +CONFIG_PATA_IT821X=m +CONFIG_PATA_JMICRON=m CONFIG_PATA_LEGACY=m -CONFIG_PATA_MARVELL=y -CONFIG_PATA_MPIIX=y -CONFIG_PATA_NETCELL=y +CONFIG_PATA_MARVELL=m +CONFIG_PATA_MPIIX=m +CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87410=y -CONFIG_PATA_NS87415=y +CONFIG_PATA_NS87410=m +CONFIG_PATA_NS87415=m +CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTI=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PDC2027X=y -CONFIG_PATA_PDC_OLD=y -CONFIG_PATA_QDI=y +CONFIG_PATA_PDC2027X=m +CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_QDI=m CONFIG_PATA_RADISYS=m CONFIG_PATA_RDC=m -CONFIG_PATA_RZ1000=y -CONFIG_PATA_SC1200=y -CONFIG_PATA_SCH=y -CONFIG_PATA_SERVERWORKS=y -CONFIG_PATA_SIL680=y +CONFIG_PATA_RZ1000=m +CONFIG_PATA_SC1200=m +CONFIG_PATA_SCH=m +CONFIG_PATA_SERVERWORKS=m +CONFIG_PATA_SIL680=m CONFIG_PATA_SIS=y -CONFIG_PATA_TRIFLEX=y -CONFIG_PATA_VIA=y -CONFIG_PATA_WINBOND=y +CONFIG_PATA_TRIFLEX=m +CONFIG_PATA_VIA=m +CONFIG_PATA_WINBOND=m CONFIG_PATA_WINBOND_VLB=m # CONFIG_PC300TOO is not set CONFIG_PC8736x_GPIO=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 440a8bd..e1ee049 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -97,10 +97,6 @@ CONFIG_NO_HZ=y CONFIG_NR_CPUS=8 CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PARPORT=m -CONFIG_PATA_CMD640_PCI=y -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=y -CONFIG_PATA_OLDPIIX=m CONFIG_PCCARD=m CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_PHYSICAL_START=0x100000 diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia index b043480..816b7dd 100644 --- a/debian.master/config/lpia/config.common.lpia +++ b/debian.master/config/lpia/config.common.lpia @@ -106,10 +106,6 @@ CONFIG_NO_HZ=y CONFIG_NR_CPUS=8 CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PARPORT=m -CONFIG_PATA_CMD640_PCI=y -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=y -CONFIG_PATA_OLDPIIX=m CONFIG_PCCARD=m CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_PHYSICAL_START=0x100000
CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m CONFIG_PATA_ARTOP=m CONFIG_PATA_ATIIXP=m CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5520=m CONFIG_PATA_CS5530=m CONFIG_PATA_CS5536=m CONFIG_PATA_EFAR=m CONFIG_PATA_HPT366=m CONFIG_PATA_HPT37X=m CONFIG_PATA_HPT3X2N=m CONFIG_PATA_HPT3X3=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPIIX=m CONFIG_PATA_NETCELL=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m CONFIG_PATA_QDI=m CONFIG_PATA_RZ1000=m CONFIG_PATA_SC1200=m CONFIG_PATA_SCH=m CONFIG_PATA_SERVERWORKS=m CONFIG_PATA_SIL680=m CONFIG_PATA_TRIFLEX=m CONFIG_PATA_VIA=m CONFIG_PATA_WINBOND=m Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 4 -- debian.master/config/armel/config.common.armel | 4 -- debian.master/config/config.common.ubuntu | 62 +++++++++++++----------- debian.master/config/i386/config.common.i386 | 4 -- debian.master/config/lpia/config.common.lpia | 4 -- 5 files changed, 33 insertions(+), 45 deletions(-)