aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShow Liu <show.liu@linaro.org>2014-01-02 11:25:34 +0800
committerShow Liu <show.liu@linaro.org>2014-02-20 16:19:29 +0800
commitae9bfc638a0b4f3c6235f47fabf44dae437bb92f (patch)
treeedc198fb98035092884824faa42d0dc4a295b878
parent94e1c73d0a584f519136c69c453900b24ce0a632 (diff)
downloadlinaro-lsk-lsk-14.01_mali.r3p0.tar.gz
fixed for compatible with other linux disttributionlsk-14.01_mali.r3p0
-rwxr-xr-xdrivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_core_linux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_core_linux.c b/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_core_linux.c
index ed3da68..0bdaefc 100755
--- a/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/t6xx/kbase/src/linux/mali_kbase_core_linux.c
@@ -2468,7 +2468,7 @@ static int kbase_platform_device_probe(struct platform_device *pdev)
mali_error mali_err;
#endif /* CONFIG_MALI_NO_MALI */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) && CONFIG_CHROMEOS
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) //&& CONFIG_CHROMEOS
kbase_platform_config *config;
int attribute_count;
struct resource resources[PLATFORM_CONFIG_RESOURCE_COUNT];
@@ -2774,7 +2774,7 @@ static const struct dev_pm_ops kbase_pm_ops = {
#endif /* CONFIG_PM_RUNTIME */
};
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) && CONFIG_CHROMEOS
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) //&& CONFIG_CHROMEOS
static const struct of_device_id mali_of_match[] = {
{
.compatible = "arm,mali",
@@ -2791,7 +2791,7 @@ static struct platform_driver kbase_platform_driver = {
.name = kbase_drv_name,
.owner = THIS_MODULE,
.pm = &kbase_pm_ops,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) && CONFIG_CHROMEOS
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) //&& CONFIG_CHROMEOS
.of_match_table = mali_of_match,
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) && CONFIG_CHROMEOS */
},
@@ -2805,7 +2805,7 @@ static int __init kbase_driver_init(void)
{
int err;
#ifdef CONFIG_MALI_PLATFORM_FAKE
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)) || !CONFIG_CHROMEOS
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)) //|| !CONFIG_CHROMEOS
kbase_platform_config *config;
int attribute_count;
struct resource resources[PLATFORM_CONFIG_RESOURCE_COUNT];