diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 13:22:14 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:23 -0600 |
| commit | 6ca619f3f7200e5a110a2ece8fc4ebea92424f3a (patch) | |
| tree | 7c1aa6aceba7a8c5581f60315129bcf283729d62 /debian.master | |
| parent | 16f83ad40f5f00efb7ad401f9675ace404e980c6 (diff) | |
UBUNTU: [Config] Enable CONFIG_MEMSTICK=m on arm
Per the non-modular module review, enable CONFIG_MEMSTICK=m on arm 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 b48a0117fe8..3bc343e6404 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -133,7 +133,6 @@ CONFIG_MANTIS_CORE=m CONFIG_MARVELL_PHY=y CONFIG_MAX_RAW_DEVS=256 CONFIG_MEMORY_HOTREMOVE=y -CONFIG_MEMSTICK=m CONFIG_MFD_JANZ_CMODIO=m # CONFIG_MFD_TMIO is not set CONFIG_MMC=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index a2720c174ff..2536f352c05 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -120,7 +120,6 @@ CONFIG_LZO_COMPRESS=m # CONFIG_MANTIS_CORE is not set CONFIG_MARVELL_PHY=y CONFIG_MAX_RAW_DEVS=256 -# CONFIG_MEMSTICK is not set # CONFIG_MFD_JANZ_CMODIO is not set CONFIG_MFD_TMIO=y CONFIG_MMC=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 639fd131639..47dfe0dda8a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2903,6 +2903,7 @@ CONFIG_MEGARAID_SAS=m # CONFIG_MELAN is not set CONFIG_MEMORY_FAILURE=y CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set CONFIG_MEMSTICK_JMICRON_38X=m # CONFIG_MEMSTICK_R592 is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 6da45775f5e..5eae4af5ba0 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -132,7 +132,6 @@ CONFIG_MACH_NO_WESTBRIDGE=y CONFIG_MANTIS_CORE=m CONFIG_MARVELL_PHY=y CONFIG_MAX_RAW_DEVS=256 -CONFIG_MEMSTICK=m CONFIG_MFD_JANZ_CMODIO=m # CONFIG_MFD_TMIO is not set CONFIG_MMC=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index b1ef0b6a669..2c34324db0a 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -118,7 +118,6 @@ CONFIG_MARVELL_PHY=m CONFIG_MAX_RAW_DEVS=256 CONFIG_MEMORY_HOTPLUG=y # CONFIG_MEMORY_HOTREMOVE is not set -CONFIG_MEMSTICK=m CONFIG_MFD_JANZ_CMODIO=m # CONFIG_MFD_TMIO is not set CONFIG_MMC=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index ec28126295b..e21bc0a9d82 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -134,7 +134,6 @@ CONFIG_MAX_ACTIVE_REGIONS=256 CONFIG_MAX_RAW_DEVS=8192 CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y -CONFIG_MEMSTICK=m CONFIG_MFD_JANZ_CMODIO=m # CONFIG_MFD_TMIO is not set CONFIG_MMC=m |