diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-25 17:54:09 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-25 17:54:09 +0200 |
| commit | b63fc1f2e15fdcbb60351659913c5d697b62e053 (patch) | |
| tree | 5a8a3c4e2e3e057e069931d88c6c644f944ac43e /linux/include | |
| parent | e2d4a5995647766cb059191c3490ef28775993ea (diff) | |
| parent | 056321ad6ae880ef351ccdf1180598cdeee63895 (diff) | |
| download | mediapointer-dvb-s2-b63fc1f2e15fdcbb60351659913c5d697b62e053.tar.gz mediapointer-dvb-s2-b63fc1f2e15fdcbb60351659913c5d697b62e053.tar.bz2 | |
Merge: from hg/~hverkuil/v4l-dvb2
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/i2c-id.h | 7 | ||||
| -rw-r--r-- | linux/include/media/ivtv-fb.h | 34 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 2 |
3 files changed, 38 insertions, 5 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index aa83d4163..b69014865 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -115,9 +115,10 @@ #define I2C_DRIVERID_KS0127 86 /* Samsung ks0127 video decoder */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ #define I2C_DRIVERID_ISL1208 88 /* Intersil ISL1208 RTC */ -#define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ -#define I2C_DRIVERID_WM8750 90 /* Wolfson WM8750 audio codec */ -#define I2C_DRIVERID_WM8753 91 /* Wolfson WM8753 audio codec */ +#define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ +#define I2C_DRIVERID_WM8750 90 /* Wolfson WM8750 audio codec */ +#define I2C_DRIVERID_WM8753 91 /* Wolfson WM8753 audio codec */ +#define I2C_DRIVERID_LM4857 92 /* LM4857 Audio Amplifier */ #define I2C_DRIVERID_I2CDEV 900 #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ diff --git a/linux/include/media/ivtv-fb.h b/linux/include/media/ivtv-fb.h new file mode 100644 index 000000000..3b746f5e3 --- /dev/null +++ b/linux/include/media/ivtv-fb.h @@ -0,0 +1,34 @@ +/* + On Screen Display cx23415 Framebuffer driver + + Copyright (C) 2006 Ian Armstrong <ian@iarmst.demon.co.uk> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _LINUX_IVTV_FB_H +#define _LINUX_IVTV_FB_H + +/* Framebuffer external API */ + +struct ivtvfb_dma_frame { + void __user *source; + unsigned long dest_offset; + int count; +}; + +#define IVTVFB_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame) + +#endif diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index c24d96af7..24ab95924 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -29,8 +29,6 @@ #include <linux/videodev2.h> #endif -#include <linux/fs.h> - #define VIDEO_MAJOR 81 /* Minor device allocation */ #define MINOR_VFL_TYPE_GRABBER_MIN 0 |