diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-11 10:42:58 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-11 10:49:35 -0500 |
commit | a5ebb87db84392edfd3142c3a6a78431d820a789 (patch) | |
tree | c30fd48ce8d9d3fc0f6ee1e3257b9b0686995ef5 | |
parent | 6a645dd87a5a506779810d7d9935c25fc2ef4687 (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>
-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 951641a96806..fe207e542032 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
@@ -47,13 +47,10 @@ | |||
47 | #include "queue.h" | 47 | #include "queue.h" |
48 | 48 | ||
49 | MODULE_ALIAS("mmc:block"); | 49 | MODULE_ALIAS("mmc:block"); |
50 | |||
51 | #ifdef KERNEL | ||
52 | #ifdef MODULE_PARAM_PREFIX | 50 | #ifdef MODULE_PARAM_PREFIX |
53 | #undef MODULE_PARAM_PREFIX | 51 | #undef MODULE_PARAM_PREFIX |
54 | #endif | 52 | #endif |
55 | #define MODULE_PARAM_PREFIX "mmcblk." | 53 | #define MODULE_PARAM_PREFIX "mmcblk." |
56 | #endif | ||
57 | 54 | ||
58 | #define INAND_CMD38_ARG_EXT_CSD 113 | 55 | #define INAND_CMD38_ARG_EXT_CSD 113 |
59 | #define INAND_CMD38_ARG_ERASE 0x00 | 56 | #define INAND_CMD38_ARG_ERASE 0x00 |