lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: fix compile error when CONFIG_BLOCK is not enabled

Browse Source 
'DISK_NAME_LEN' is undeclared when CONFIG_BLOCK is disabled; its use was
introduced via genhd.h by the general purpose partition patch.

To fix, we just add our own MAX_MMC_PART_NAME_LEN macro instead of using
DISK_NAME_LEN.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Andrei Warkentin <andreiw@vmware.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Namjae Jeon
2011-10-13 00:43:14 +09:00
committed by Chris Ball
parent 336c716ae2
commit a6029e1f75
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/mmc/card.h
View File

@@ -12,7 +12,6 @@
#include <linux/mmc/core.h> #include <linux/mmc/core.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/genhd.h>
struct mmc_cid { struct mmc_cid {
unsigned int manfid; unsigned int manfid;
@@ -175,6 +174,7 @@ struct sdio_func_tuple;
#define MMC_NUM_BOOT_PARTITION 2 #define MMC_NUM_BOOT_PARTITION 2
#define MMC_NUM_GP_PARTITION 4 #define MMC_NUM_GP_PARTITION 4
#define MMC_NUM_PHY_PARTITION 6 #define MMC_NUM_PHY_PARTITION 6
#define MAX_MMC_PART_NAME_LEN 20
/* /*
* MMC Physical partitions * MMC Physical partitions
@@ -182,7 +182,7 @@ struct sdio_func_tuple;
struct mmc_part { struct mmc_part {
unsigned int size; /* partition size (in bytes) */ unsigned int size; /* partition size (in bytes) */
unsigned int part_cfg; /* partition type */ unsigned int part_cfg; /* partition type */
char name[DISK_NAME_LEN]; char name[MAX_MMC_PART_NAME_LEN];
bool force_ro; /* to make boot parts RO by default */ bool force_ro; /* to make boot parts RO by default */
}; };