diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-11 16:42:58 +0100 |
|---|---|---|
| committer | Haibo Chen <haibo.chen@nxp.com> | 2016-03-02 10:40:32 +0800 |
| commit | 030025eda96b27d284b0319f8323203e35b90a2d (patch) | |
| tree | acabaaae4f65ec69b05766280327a69151584118 /drivers/mmc | |
| parent | c64d0e5256e7a2a1bb78f5e1a7c74739104863b7 (diff) | |
Revert "mmc: block: don't use parameter prefix if built as module"
This reverts commit 829b6962f7e3cfc06f7c5c26269fd47ad48cf503.
Revert this change as it causes a sysfs path to change and therefore
introduces and ABI regression. More precisely Android's vold is not being
able to access /sys/module/mmcblk/parameters/perdev_minors any more, since
the path becomes changed to: "/sys/module/mmc_block/..."
Fixes: 829b6962f7e3 ("mmc: block: don't use parameter prefix if built as
module")
Reported-by: John Stultz <john.stultz@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit a5ebb87db84392edfd3142c3a6a78431d820a789)
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 17d63653fa72..be776fa96e80 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -47,13 +47,10 @@ #include "queue.h" MODULE_ALIAS("mmc:block"); - -#ifdef KERNEL #ifdef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX #endif #define MODULE_PARAM_PREFIX "mmcblk." -#endif #define INAND_CMD38_ARG_EXT_CSD 113 #define INAND_CMD38_ARG_ERASE 0x00 |