[APPLIED] [PATCH] UBUNTU: [Config] CONFIG_NDISWRAPPER=m across all configs

[Leann Ogasawara]

Applied to Maverick linux master.

Thanks,
Leann

On Tue, 2010-07-13 at 07:53 -0600, Tim Gardner wrote:
> Now that CONFIG_NDISWRAPPER depends on X86, we can just set
> it in one place.
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64 |    1 -
>  debian.master/config/armel/config.common.armel |    1 -
>  debian.master/config/config.common.ports       |    1 -
>  debian.master/config/config.common.ubuntu      |    1 +
>  debian.master/config/i386/config.common.i386   |    1 -
>  5 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 03a1d8e..0f25e8e 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -140,7 +140,6 @@ CONFIG_MTD_SLRAM=m
>  CONFIG_MTD_SM_COMMON=m
>  CONFIG_MTD_SST25L=m
>  CONFIG_MUTEX_SPIN_ON_OWNER=y
> -CONFIG_NDISWRAPPER=m
>  CONFIG_NEED_DMA_MAP_STATE=y
>  # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
>  CONFIG_NET_CLS_CGROUP=y
> diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> index b948230..a40b19f 100644
> --- a/debian.master/config/armel/config.common.armel
> +++ b/debian.master/config/armel/config.common.armel
> @@ -45,7 +45,6 @@ CONFIG_MTD_NAND_IDS=y
>  # CONFIG_MTD_SM_COMMON is not set
>  # CONFIG_MTD_SST25L is not set
>  # CONFIG_MUTEX_SPIN_ON_OWNER is not set
> -# CONFIG_NDISWRAPPER is not set
>  CONFIG_NEED_DMA_MAP_STATE=y
>  # CONFIG_NET_POCKET is not set
>  # CONFIG_PCCARD is not set
> diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
> index cbbe384..2aaddd2 100644
> --- a/debian.master/config/config.common.ports
> +++ b/debian.master/config/config.common.ports
> @@ -2161,7 +2161,6 @@ CONFIG_NCPFS_OS2_NS=y
>  CONFIG_NCPFS_PACKET_SIGNING=y
>  CONFIG_NCPFS_STRONG=y
>  CONFIG_NCP_FS=m
> -# CONFIG_NDISWRAPPER is not set
>  CONFIG_NE2K_PCI=m
>  CONFIG_NEED_MULTIPLE_NODES=y
>  CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index f4a7a05..d755fc9 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -2747,6 +2747,7 @@ CONFIG_NCPFS_PACKET_SIGNING=y
>  # CONFIG_NCPFS_SMALLDOS is not set
>  CONFIG_NCPFS_STRONG=y
>  CONFIG_NCP_FS=m
> +CONFIG_NDISWRAPPER=m
>  CONFIG_NE2000=m
>  CONFIG_NE2K_PCI=m
>  CONFIG_NE2_MCA=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 97cec96..e5c00b4 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -140,7 +140,6 @@ CONFIG_MTD_SLRAM=m
>  CONFIG_MTD_SM_COMMON=m
>  CONFIG_MTD_SST25L=m
>  CONFIG_MUTEX_SPIN_ON_OWNER=y
> -CONFIG_NDISWRAPPER=m
>  # CONFIG_NEED_DMA_MAP_STATE is not set
>  # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
>  CONFIG_NET_CLS_CGROUP=y