summaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorNamjae Jeon <linkinjeon@gmail.com>2011-10-13 00:43:14 +0900
committerChris Ball <cjb@laptop.org>2011-10-27 09:11:34 -0400
commita6029e1f75bb484c1f5bc68b6a8572e4024795bc (patch)
tree79b8487c706e93fa4e0be28d3a4297d65851ac35 /include/linux/mmc
parent336c716ae2272c9a26a6f82976d0e077d8ca824e (diff)
downloadop-kernel-dev-a6029e1f75bb484c1f5bc68b6a8572e4024795bc.zip
op-kernel-dev-a6029e1f75bb484c1f5bc68b6a8572e4024795bc.tar.gz
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 <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>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/card.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 1684d92..415f2db 100644
--- 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,6 +174,7 @@ 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
@@ -182,7 +182,7 @@ struct sdio_func_tuple;
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 */
};
OpenPOWER on IntegriCloud