diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 16:47:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 16:47:51 -0700 |
| commit | 7992018d979460af59fbae8a48f9641305aea438 (patch) | |
| tree | de64367c49aa76606e7ea8354b299d067f1c0bda /drivers/media/video/ivtv/ivtv-driver.h | |
| parent | 5fd52203e1856ad925b1a6adae9a22e533da94e2 (diff) | |
| parent | edd75ede2d40eadb98e07d87e88fa970f86ffe9e (diff) | |
| download | kernel_goldelico_gta04-7992018d979460af59fbae8a48f9641305aea438.zip kernel_goldelico_gta04-7992018d979460af59fbae8a48f9641305aea438.tar.gz kernel_goldelico_gta04-7992018d979460af59fbae8a48f9641305aea438.tar.bz2 | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (5691): Ov7670: reset clkrc in rgb565 mode
V4L/DVB (5690): Cafe_ccic: Properly power down the sensor
V4L/DVB (5680): Tuner-simple.c fix suport for SECAM with FI1216MF
V4L/DVB (5630): Dvb-core: Handle failures to create devices
V4L/DVB (5639a): Fix dst usage count
V4L/DVB (5670): Adding new fields to v4l2_pix_format broke the ABI, reverted that change
V4L/DVB (5640): Fix: em28xx shouldn't be selecting VIDEO_BUF
V4L/DVB (5639): Fix Kconfig dependencies for ivtv
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.h')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index 9a412d6..552f045 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h @@ -67,14 +67,6 @@ #include <media/ivtv.h> -#ifdef CONFIG_LIRC_I2C -# error "This driver is not compatible with the LIRC I2C kernel configuration option." -#endif /* CONFIG_LIRC_I2C */ - -#ifndef CONFIG_PCI -# error "This driver requires kernel PCI support." -#endif /* CONFIG_PCI */ - #define IVTV_ENCODER_OFFSET 0x00000000 #define IVTV_ENCODER_SIZE 0x00800000 /* Last half isn't needed 0x01000000 */ |