diff options
author | Rob Clark <robdclark@gmail.com> | 2014-05-30 15:37:54 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2014-05-30 15:37:54 -0400 |
commit | fb27b8f29f60b8799df1aa60cd9647d56d62810e (patch) | |
tree | 71f0f426ef380c84961b15769685c69e84e5ef0e | |
parent | 3189650d7f5de9e1b7f530464de7f0000411a408 (diff) |
drm/msm: update for ARCH_MSM -> ARCH_QCOM
Architecture rename/split.. ARCH_QCOM is for the non-legacy platforms
(ie. device-tree, multiplatform support, etc).
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | drivers/gpu/drm/msm/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/msm_drv.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index b6984971ce0c..f12388967856 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig | |||
@@ -3,7 +3,7 @@ config DRM_MSM | |||
3 | tristate "MSM DRM" | 3 | tristate "MSM DRM" |
4 | depends on DRM | 4 | depends on DRM |
5 | depends on MSM_IOMMU | 5 | depends on MSM_IOMMU |
6 | depends on ARCH_MSM8960 || (ARM && COMPILE_TEST) | 6 | depends on ARCH_QCOM || (ARM && COMPILE_TEST) |
7 | select DRM_KMS_HELPER | 7 | select DRM_KMS_HELPER |
8 | select SHMEM | 8 | select SHMEM |
9 | select TMPFS | 9 | select TMPFS |
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 9d10ee0b5aac..588c427d0243 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <asm/sizes.h> | 33 | #include <asm/sizes.h> |
34 | 34 | ||
35 | 35 | ||
36 | #if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_ARCH_MSM) | 36 | #if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_ARCH_QCOM) |
37 | /* stubs we need for compile-test: */ | 37 | /* stubs we need for compile-test: */ |
38 | static inline struct device *msm_iommu_get_ctx(const char *ctx_name) | 38 | static inline struct device *msm_iommu_get_ctx(const char *ctx_name) |
39 | { | 39 | { |