Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git

This commit is contained in:
Linus Torvalds 2005-08-29 10:35:21 -07:00
commit 9ab7486e44
6 changed files with 112 additions and 22 deletions

View file

@ -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 *);