diff --git a/[refs] b/[refs] index 431f85c7aa04..cea1f7a20d69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbb18b309d3d6b6661f931279697eac77b6591c9 +refs/heads/master: b67e198073b2d2f16572f5fa77553fec14775f69 diff --git a/trunk/include/linux/mmc/host.h b/trunk/include/linux/mmc/host.h index 9a03d0335745..742f0e102e1e 100644 --- a/trunk/include/linux/mmc/host.h +++ b/trunk/include/linux/mmc/host.h @@ -167,6 +167,11 @@ struct mmc_async_req { int (*err_check) (struct mmc_card *, struct mmc_async_req *); }; +struct mmc_hotplug { + unsigned int irq; + void *handler_priv; +}; + struct mmc_host { struct device *parent; struct device class_dev; @@ -300,6 +305,7 @@ struct mmc_host { struct delayed_work detect; int detect_change; /* card detect flag */ + struct mmc_hotplug hotplug; const struct mmc_bus_ops *bus_ops; /* current bus driver */ unsigned int bus_refs; /* reference counter */