diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:27:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:27:31 -0700 |
| commit | bdee6ac7d1c9a4a9b65db1753b0bfa0b61361dde (patch) | |
| tree | d2d260a3aa7e0902be023c0fbdb52ec26dbd6609 /include | |
| parent | 4836e3007882984279ca63d3c42bf0b14616eb78 (diff) | |
| parent | deec9ae31e6079551ce9260d29a4cf83e5b19a83 (diff) | |
| download | op-kernel-dev-bdee6ac7d1c9a4a9b65db1753b0bfa0b61361dde.zip op-kernel-dev-bdee6ac7d1c9a4a9b65db1753b0bfa0b61361dde.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
atmel-mci: debugfs support
mmc: Add per-card debugfs support
mmc: Export internal host state through debugfs
imxmmc: fix crash when no platform data is provided
imxmmc: fix platform resources
imxmmc: remove DEBUG definition
mmc_spi: put signals to low power off fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/card.h | 2 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 0d508ac..ee6e822 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -111,6 +111,8 @@ struct mmc_card { unsigned num_info; /* number of info strings */ const char **info; /* info strings */ struct sdio_func_tuple *tuples; /* unknown common tuples */ + + struct dentry *debugfs_root; }; #define mmc_card_mmc(c) ((c)->type == MMC_TYPE_MMC) diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 10a2080..9c288c9 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -157,6 +157,8 @@ struct mmc_host { struct led_trigger *led; /* activity led */ #endif + struct dentry *debugfs_root; + unsigned long private[0] ____cacheline_aligned; }; |
