diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/linux/mmc/boot.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'include/linux/mmc/boot.h')
| -rw-r--r-- | include/linux/mmc/boot.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mmc/boot.h b/include/linux/mmc/boot.h new file mode 100644 index 000000000000..39d787c229cb --- /dev/null +++ b/include/linux/mmc/boot.h | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | #ifndef MMC_BOOT_H | ||
| 2 | #define MMC_BOOT_H | ||
| 3 | |||
| 4 | enum { MMC_PROGRESS_ENTER, MMC_PROGRESS_INIT, | ||
| 5 | MMC_PROGRESS_LOAD, MMC_PROGRESS_DONE }; | ||
| 6 | |||
| 7 | #endif | ||