From: Ulf Hansson Date: Thu, 11 Feb 2016 15:54:11 +0000 (+0100) Subject: Revert "mmc: block: don't use parameter prefix if built as module" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf9c9b48f1617f6653483483b231b27b0683177d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 Cc: Andy Shevchenko Signed-off-by: Ulf Hansson Signed-off-by: John Stultz --- diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index e5b749822acc..daffad24e8e5 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