diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-12 14:37:05 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 11:32:47 +0200 |
commit | 160399144468fb69dc36fea0312379b62a40b6e6 (patch) | |
tree | a34eaf167bf88036da035110b3f00a49710cde2d /backport/backport-include/linux/mmc | |
parent | ff5c6c9bed6cbfbb12234e91c778d1d2b3ecc3b3 (diff) |
backports: dissolve compat-2.6.27.h
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport/backport-include/linux/mmc')
-rw-r--r-- | backport/backport-include/linux/mmc/core.h | 12 | ||||
-rw-r--r-- | backport/backport-include/linux/mmc/sdio_func.h | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/backport/backport-include/linux/mmc/core.h b/backport/backport-include/linux/mmc/core.h new file mode 100644 index 00000000..02d7a989 --- /dev/null +++ b/backport/backport-include/linux/mmc/core.h @@ -0,0 +1,12 @@ +#ifndef __BACKPORT_MMC_CORE_H +#define __BACKPORT_MMC_CORE_H +#include <linux/version.h> +#include_next <linux/mmc/core.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) +#define mmc_align_data_size LINUX_BACKPORT(mmc_align_data_size) +extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int); +#endif /* 2.6.24 - 2.6.26 */ + +#endif /* __BACKPORT_MMC_CORE_H */ diff --git a/backport/backport-include/linux/mmc/sdio_func.h b/backport/backport-include/linux/mmc/sdio_func.h index b5960043..f32cafcd 100644 --- a/backport/backport-include/linux/mmc/sdio_func.h +++ b/backport/backport-include/linux/mmc/sdio_func.h @@ -31,4 +31,10 @@ extern int sdio_set_host_pm_flags(struct sdio_func *func, mmc_pm_flag_t flags); #define dev_to_sdio_func(d) container_of(d, struct sdio_func, dev) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) && \ + LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) +#define sdio_align_size LINUX_BACKPORT(sdio_align_size) +extern unsigned int sdio_align_size(struct sdio_func *func, unsigned int sz); +#endif /* 2.6.24 - 2.6.26 */ + #endif /* __BACKPORT_MMC_SDIO_FUNC_H */ |