aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:35:21 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:35:21 -0700
commit9ab7486e446447c8e62f8f46ca85b809e6a9d491 (patch)
treeeabab23a08b361a204523e46147c930c318d5520 /include/linux
parent975f957dc408925805dd8f5aa4217b7eeea2d005 (diff)
parentdce773771834221817e2d359a7e07a618ba08807 (diff)
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mmc/host.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f90f674eb3b..9a0893f3249 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -63,11 +63,12 @@ struct device;
struct mmc_host {
struct device *dev;
+ struct class_device class_dev;
+ int index;
struct mmc_host_ops *ops;
unsigned int f_min;
unsigned int f_max;
u32 ocr_avail;
- char host_name[8];
/* host specific block data */
unsigned int max_seg_size; /* see blk_queue_max_segment_size */
@@ -97,6 +98,7 @@ extern void mmc_free_host(struct mmc_host *);
#define mmc_priv(x) ((void *)((x) + 1))
#define mmc_dev(x) ((x)->dev)
+#define mmc_hostname(x) ((x)->class_dev.class_id)
extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
extern int mmc_resume_host(struct mmc_host *);