Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30530fab authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: smem: Correct stubbed API dependency"

parents 853292e7 81f615b8

include/soc/qcom/smem.h

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -155,7 +155,7 @@ enum { 
	SMEM_NUM_ITEMS,

};



#ifdef CONFIG_MSM_SMD

#ifdef CONFIG_MSM_SMEM

void *smem_alloc(unsigned id, unsigned size_in, unsigned to_proc,

								unsigned flags);

void *smem_find(unsigned id, unsigned size_in, unsigned to_proc,
@@ -226,5 +226,5 @@ static inline int __init msm_smem_init(void) 
{

	return 0;

}

#endif /* CONFIG_MSM_SMD  */

#endif /* CONFIG_MSM_SMEM  */

#endif /* _ARCH_ARM_MACH_MSM_SMEM_H_ */