mmc: fix compile error when CONFIG_BLOCK is not enabled

'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 <[email protected]> Signed-off-by: Namjae Jeon <[email protected]> Acked-by: Randy Dunlap <[email protected]> Acked-by: Andrei Warkentin <[email protected]> Signed-off-by: Chris Ball <[email protected]>
jadonk · Oct 27, 2011 · a6029e1 · a6029e1
1 parent 336c716
commit a6029e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
@@ -12,7 +12,6 @@
 
 #include <linux/mmc/core.h>
 #include <linux/mod_devicetable.h>
-#include <linux/genhd.h>
 
 struct mmc_cid {
 	unsigned int		manfid;
@@ -175,14 +174,15 @@ struct sdio_func_tuple;
 #define MMC_NUM_BOOT_PARTITION	2
 #define MMC_NUM_GP_PARTITION	4
 #define MMC_NUM_PHY_PARTITION	6
+#define MAX_MMC_PART_NAME_LEN	20
 
 /*
  * MMC Physical partitions
  */
 struct mmc_part {
 	unsigned int	size;	/* partition size (in bytes) */
 	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 */
 };