diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-17 17:53:57 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-18 16:31:59 +0200 |
| commit | c28265764ec6ad9995eb0c761a376ffc9f141fcd (patch) | |
| tree | 3ad899757480d47deb2be6011509a4243e8e0dc2 /drivers/media/video/samsung/mali/linux/mali_linux_pm.h | |
| parent | 0ddbcb39c0dc0318f68d858f25a96a074142af2f (diff) | |
| download | kernel_samsung_smdk4412-c28265764ec6ad9995eb0c761a376ffc9f141fcd.zip kernel_samsung_smdk4412-c28265764ec6ad9995eb0c761a376ffc9f141fcd.tar.gz kernel_samsung_smdk4412-c28265764ec6ad9995eb0c761a376ffc9f141fcd.tar.bz2 | |
applied patches from i9305 jb sources, updated mali to r3p0
Change-Id: Iec4bc4e2fb59e2cf5b4d25568a644d4e3719565e
Diffstat (limited to 'drivers/media/video/samsung/mali/linux/mali_linux_pm.h')
| -rw-r--r-- | drivers/media/video/samsung/mali/linux/mali_linux_pm.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/samsung/mali/linux/mali_linux_pm.h b/drivers/media/video/samsung/mali/linux/mali_linux_pm.h index a8c0c52..10f633e 100644 --- a/drivers/media/video/samsung/mali/linux/mali_linux_pm.h +++ b/drivers/media/video/samsung/mali/linux/mali_linux_pm.h @@ -1,5 +1,6 @@ + /* - * Copyright (C) 2010 ARM Limited. All rights reserved. + * Copyright (C) 2010-2012 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the GNU General Public License version 2 * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. @@ -11,8 +12,6 @@ #ifndef __MALI_LINUX_PM_H__ #define __MALI_LINUX_PM_H__ -#if USING_MALI_PMM - #ifdef CONFIG_PM /* Number of power states supported for making power up and down */ typedef enum @@ -20,7 +19,6 @@ typedef enum _MALI_DEVICE_SUSPEND, /* Suspend */ _MALI_DEVICE_RESUME, /* Resume */ _MALI_DEVICE_MAX_POWER_STATES, /* Maximum power states */ - _MALI_DEVICE_SHUTDOWN, /* Power off states*/ } _mali_device_power_states; /* Number of DVFS events */ @@ -49,5 +47,4 @@ int mali_device_resume(u32 event_id, struct task_struct **pwr_mgmt_thread); int mali_get_ospmm_thread_state(void); #endif /* CONFIG_PM */ -#endif /* USING_MALI_PMM */ #endif /* __MALI_LINUX_PM_H___ */ |