[APPLIED] [PATCH] UBUNTU: [Config] Enable new Smartmedia/xD translation layer

[Leann Ogasawara]

On Fri, 2010-06-11 at 00:03 +0300, Maxim Levitsky wrote:
> BugLink: http://bugs.launchpad.net/bugs/202490
> Ignore: yes
> 
> Despite quite scary description I gave this driver, it does work well,
> and no data corruptions were observed.
> It still won't load automaticly thus user will be able to choose between
> R/O and this driver.
> 
> I will soon post an udev rule to load this driver automaticly as well.
> 
> Signed-off-by: Maxim Levitsky <maximlevitsky at gmail.com>

Looks reasonable.  I've gone ahead and applied this to the Maverick
linux master branch.

Thanks,
Leann

> ---
>  debian.master/config/armel/config.common.armel     |    1 -
>  debian.master/config/armel/config.flavour.omap     |    1 +
>  .../config/armel/config.flavour.versatile          |    1 +
>  debian.master/config/config.common.ubuntu          |    2 +-
>  4 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> index c803e58..42b4696 100644
> --- a/debian.master/config/armel/config.common.armel
> +++ b/debian.master/config/armel/config.common.armel
> @@ -38,7 +38,6 @@ CONFIG_MTD_BLOCK=y
>  CONFIG_MTD_CHAR=y
>  # CONFIG_MTD_DATAFLASH is not set
>  # CONFIG_MTD_GPIO_ADDR is not set
> -CONFIG_MTD_NAND_ECC=y
>  CONFIG_MTD_NAND_IDS=y
>  # CONFIG_MTD_NAND_NANDSIM is not set
>  # CONFIG_MTD_NAND_PLATFORM is not set
> diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
> index 04cf39f..fd9bcf5 100644
> --- a/debian.master/config/armel/config.flavour.omap
> +++ b/debian.master/config/armel/config.flavour.omap
> @@ -85,6 +85,7 @@ CONFIG_MTD_GEN_PROBE=m
>  CONFIG_MTD_JEDECPROBE=m
>  CONFIG_MTD_MTDRAM=m
>  CONFIG_MTD_NAND=y
> +CONFIG_MTD_NAND_ECC=y
>  CONFIG_MTD_ONENAND=m
>  CONFIG_MTD_PHRAM=m
>  CONFIG_MTD_PHYSMAP=m
> diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile
> index 011cc7b..269cc8f 100644
> --- a/debian.master/config/armel/config.flavour.versatile
> +++ b/debian.master/config/armel/config.flavour.versatile
> @@ -85,6 +85,7 @@ CONFIG_MTD_GEN_PROBE=y
>  # CONFIG_MTD_JEDECPROBE is not set
>  # CONFIG_MTD_MTDRAM is not set
>  # CONFIG_MTD_NAND is not set
> +CONFIG_MTD_NAND_ECC=m
>  # CONFIG_MTD_ONENAND is not set
>  # CONFIG_MTD_PHRAM is not set
>  # CONFIG_MTD_PHYSMAP is not set
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index e77a720..3da9b6d 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -3887,7 +3887,7 @@ CONFIG_SMSC_SCH311X_WDT=m
>  CONFIG_SMS_SDIO_DRV=m
>  CONFIG_SMS_SIANO_MDTV=m
>  CONFIG_SMS_USB_DRV=m
> -# CONFIG_SM_FTL is not set
> +CONFIG_SM_FTL=m
>  CONFIG_SND_AC97_CODEC=m
>  CONFIG_SND_AC97_POWER_SAVE=y
>  CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
> -- 
> 1.7.0.4