aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hugo <jhugo@codeaurora.org>2014-01-07 16:30:43 -0700
committerJeff Hugo <jhugo@codeaurora.org>2014-01-08 15:10:19 -0700
commit81f615b82c972685b70d41e5a7ecb5732b3b1b09 (patch)
tree48e2e38db5515835f6c75e3d89ee151ff44e97a1
parenta525e5d036cfcadfe70a58b3b527f0b277f1ab54 (diff)
soc: qcom: smem: Correct stubbed API dependency
The Shared Memory driver API stubs depend on CONFIG_MSM_SMD being defined, but SMD is a client of SMEM, so it is improper for any part of SMEM to depend on SMD. Instead the stubs should depend on CONFIG_MSM_SMEM. Correct the dependency. Change-Id: I65667964d6228e5cdec4625015eebd56825ae2e1 Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
-rw-r--r--include/soc/qcom/smem.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h
index 92939dd7846..a3b7ca65b13 100644
--- a/include/soc/qcom/smem.h
+++ b/include/soc/qcom/smem.h
@@ -1,4 +1,4 @@
-/* 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_ */