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 /drivers/gpu | |
| parent | 3189650d7f5de9e1b7f530464de7f0000411a408 (diff) | |
| download | linux-fb27b8f29f60b8799df1aa60cd9647d56d62810e.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu')
| -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 tristate "MSM DRM" depends on DRM depends on MSM_IOMMU - depends on ARCH_MSM8960 || (ARM && COMPILE_TEST) + depends on ARCH_QCOM || (ARM && COMPILE_TEST) select DRM_KMS_HELPER select SHMEM 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 @@ #include <asm/sizes.h> -#if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_ARCH_MSM) +#if defined(CONFIG_COMPILE_TEST) && !defined(CONFIG_ARCH_QCOM) /* stubs we need for compile-test: */ static inline struct device *msm_iommu_get_ctx(const char *ctx_name) { |