diff options
| author | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2010-03-15 18:13:37 -0700 |
|---|---|---|
| committer | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2010-03-15 18:13:37 -0700 |
| commit | 19bcd48a9e160350ca4a54395b0ac38a4b9fecab (patch) | |
| tree | ef3c8bfaa76dc3b0aff07bd2269da2349ff477d7 /libc/kernel/common/linux | |
| parent | 95b80fcb12033201fd05ec976785e7e5f4f79677 (diff) | |
| parent | 89d6e81d2ac927c0de87ba2582211c85a4419744 (diff) | |
| download | bionic-19bcd48a9e160350ca4a54395b0ac38a4b9fecab.zip bionic-19bcd48a9e160350ca4a54395b0ac38a4b9fecab.tar.gz bionic-19bcd48a9e160350ca4a54395b0ac38a4b9fecab.tar.bz2 | |
Merge change I3ee8cde6 into eclair
* changes:
7x30: Rename header files with msm prefix
Diffstat (limited to 'libc/kernel/common/linux')
| -rw-r--r-- | libc/kernel/common/linux/msm_vidc_dec.h (renamed from libc/kernel/common/linux/ss_vdec.h) | 4 | ||||
| -rw-r--r-- | libc/kernel/common/linux/msm_vidc_enc.h (renamed from libc/kernel/common/linux/ss_venc.h) | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libc/kernel/common/linux/ss_vdec.h b/libc/kernel/common/linux/msm_vidc_dec.h index 140f900..07ec2f0 100644 --- a/libc/kernel/common/linux/ss_vdec.h +++ b/libc/kernel/common/linux/msm_vidc_dec.h @@ -9,8 +9,8 @@ *** **************************************************************************** ****************************************************************************/ -#ifndef _SS_VIDEO_DECODER_H_ -#define _SS_VIDEO_DECODER_H_ +#ifndef _MSM_VIDC_DEC_H_ +#define _MSM_VIDC_DEC_H_ #include <linux/types.h> #include <linux/ioctl.h> diff --git a/libc/kernel/common/linux/ss_venc.h b/libc/kernel/common/linux/msm_vidc_enc.h index f8493d2..71e7dc5 100644 --- a/libc/kernel/common/linux/ss_venc.h +++ b/libc/kernel/common/linux/msm_vidc_enc.h @@ -9,8 +9,8 @@ *** **************************************************************************** ****************************************************************************/ -#ifndef _SS_VIDEOENCODER_H -#define _SS_VIDEOENCODER_H +#ifndef _MSM_VIDC_ENC_H_ +#define _MSM_VIDC_ENC_H_ #include <linux/types.h> #include <linux/ioctl.h> |