diff options
| author | Justin <justin.a.rogers@gmail.com> | 2013-03-25 18:06:02 -0500 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-03-26 10:53:49 +0000 |
| commit | 88234890ea8fd8f60101c0b9690f1ea756cc3c5b (patch) | |
| tree | 8693cc089c9608442a871037d2a576f4dd104660 /drivers/media/video/samsung/mali/linux/mali_osk_specific.h | |
| parent | cba07183cc76b06a5ef2b20eef70d203dc5bcd5d (diff) | |
| download | kernel_samsung_smdk4412-88234890ea8fd8f60101c0b9690f1ea756cc3c5b.zip kernel_samsung_smdk4412-88234890ea8fd8f60101c0b9690f1ea756cc3c5b.tar.gz kernel_samsung_smdk4412-88234890ea8fd8f60101c0b9690f1ea756cc3c5b.tar.bz2 | |
smdk4412: mali: merge with r3p1 driver from note8
Change-Id: I75db69081b986ec326fe347f73aa3655648e6b81
Diffstat (limited to 'drivers/media/video/samsung/mali/linux/mali_osk_specific.h')
| -rw-r--r-- | drivers/media/video/samsung/mali/linux/mali_osk_specific.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/video/samsung/mali/linux/mali_osk_specific.h b/drivers/media/video/samsung/mali/linux/mali_osk_specific.h index 157368b..83ee906 100644 --- a/drivers/media/video/samsung/mali/linux/mali_osk_specific.h +++ b/drivers/media/video/samsung/mali/linux/mali_osk_specific.h @@ -17,15 +17,17 @@ #ifndef __MALI_OSK_SPECIFIC_H__ #define __MALI_OSK_SPECIFIC_H__ -#include <asm/uaccess.h> +#ifdef __cplusplus +extern "C" +{ +#endif #define MALI_STATIC_INLINE static inline #define MALI_NON_STATIC_INLINE inline -MALI_STATIC_INLINE u32 _mali_osk_copy_from_user(void *to, void *from, u32 n) -{ - return (u32)copy_from_user(to, from, (unsigned long)n); +#ifdef __cplusplus } +#endif /** The list of events supported by the Mali DDK. */ typedef enum @@ -37,7 +39,7 @@ typedef enum ACTIVITY_FP0, ACTIVITY_FP1, ACTIVITY_FP2, - ACTIVITY_FP3, + ACTIVITY_FP3, /* L2 cache counters */ COUNTER_L2_C0, @@ -57,7 +59,7 @@ typedef enum COUNTER_FP3_C0, COUNTER_FP3_C1, - /* + /* * If more hardware counters are added, the _mali_osk_hw_counter_table * below should also be updated. */ |