Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB: v4l2-ctrls.c: needs to include slab.h
  V4L/DVB: fix Kconfig to depends on VIDEO_IR
  V4L/DVB: Fix IR_CORE dependencies
Linus Torvalds 15 years ago
parent
a30bfd6cd4 2b80163c39
commit
1547ac893a
15 changed files with 22 additions and 14 deletions
Unified View Show Diff Stats
  1. 8 1
      drivers/media/IR/Kconfig
  2. 1 1
      drivers/media/dvb/dm1105/Kconfig
  3. 1 1
      drivers/media/dvb/dvb-usb/Kconfig
  4. 1 1
      drivers/media/dvb/siano/Kconfig
  5. 1 1
      drivers/media/dvb/ttpci/Kconfig
  6. 1 1
      drivers/media/video/bt8xx/Kconfig
  7. 1 1
      drivers/media/video/cx18/Kconfig
  8. 1 1
      drivers/media/video/cx231xx/Kconfig
  9. 1 1
      drivers/media/video/cx23885/Kconfig
  10. 1 1
      drivers/media/video/cx88/Kconfig
  11. 1 1
      drivers/media/video/em28xx/Kconfig
  12. 1 1
      drivers/media/video/ivtv/Kconfig
  13. 1 1
      drivers/media/video/saa7134/Kconfig
  14. 1 1
      drivers/media/video/tlg2300/Kconfig
  15. 1 0
      drivers/media/video/v4l2-ctrls.c

+ 8 - 1
drivers/media/IR/Kconfig
View File 

@@ -2,14 +2,21 @@ menuconfig IR_CORE
 
 	tristate "Infrared remote controller adapters"
 
 	tristate "Infrared remote controller adapters"
 
 	depends on INPUT
 
 	depends on INPUT
 
 	default INPUT
 
 	default INPUT
 
+	---help---
 
+	  Enable support for Remote Controllers on Linux. This is
 
+	  needed in order to support several video capture adapters.
 
 
 
-if IR_CORE
 
+	  Enable this option if you have a video capture board even
 
+	  if you don't need IR, as otherwise, you may not be able to
 
+	  compile the driver for your adapter.
 
 
 
 config VIDEO_IR
 
 config VIDEO_IR
 
 	tristate
 
 	tristate
 
 	depends on IR_CORE
 
 	depends on IR_CORE
 
 	default IR_CORE
 
 	default IR_CORE
 
 
 
+if IR_CORE
 
+
 
 config LIRC
 
 config LIRC
 
 	tristate
 
 	tristate
 
 	default y
 
 	default y

+ 1 - 1
drivers/media/dvb/dm1105/Kconfig
View File 

@@ -9,7 +9,7 @@ config DVB_DM1105
 
 	select DVB_CX24116 if !DVB_FE_CUSTOMISE
 
 	select DVB_CX24116 if !DVB_FE_CUSTOMISE
 
 	select DVB_SI21XX if !DVB_FE_CUSTOMISE
 
 	select DVB_SI21XX if !DVB_FE_CUSTOMISE
 
 	select DVB_DS3000 if !DVB_FE_CUSTOMISE
 
 	select DVB_DS3000 if !DVB_FE_CUSTOMISE
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	help
 
 	help
 
 	  Support for cards based on the SDMC DM1105 PCI chip like
 
 	  Support for cards based on the SDMC DM1105 PCI chip like
 
 	  DvbWorld 2002
 
 	  DvbWorld 2002

+ 1 - 1
drivers/media/dvb/dvb-usb/Kconfig
View File 

@@ -1,6 +1,6 @@
 
 config DVB_USB
 
 config DVB_USB
 
 	tristate "Support for various USB DVB devices"
 
 	tristate "Support for various USB DVB devices"
 
-	depends on DVB_CORE && USB && I2C && INPUT
 
+	depends on DVB_CORE && USB && I2C && IR_CORE
 
 	help
 
 	help
 
 	  By enabling this you will be able to choose the various supported
 
 	  By enabling this you will be able to choose the various supported
 
 	  USB1.1 and USB2.0 DVB devices.
 
 	  USB1.1 and USB2.0 DVB devices.

+ 1 - 1
drivers/media/dvb/siano/Kconfig
View File 

@@ -4,7 +4,7 @@
 
 
 
 config SMS_SIANO_MDTV
 
 config SMS_SIANO_MDTV
 
 	tristate "Siano SMS1xxx based MDTV receiver"
 
 	tristate "Siano SMS1xxx based MDTV receiver"
 
-	depends on DVB_CORE && INPUT && HAS_DMA
 
+	depends on DVB_CORE && IR_CORE && HAS_DMA
 
 	---help---
 
 	---help---
 
 	  Choose Y or M here if you have MDTV receiver with a Siano chipset.
 
 	  Choose Y or M here if you have MDTV receiver with a Siano chipset.

+ 1 - 1
drivers/media/dvb/ttpci/Kconfig
View File 

@@ -98,7 +98,7 @@ config DVB_BUDGET_CI
 
 	select DVB_LNBP21 if !DVB_FE_CUSTOMISE
 
 	select DVB_LNBP21 if !DVB_FE_CUSTOMISE
 
 	select DVB_TDA10023 if !DVB_FE_CUSTOMISE
 
 	select DVB_TDA10023 if !DVB_FE_CUSTOMISE
 
 	select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
 
 	select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMISE
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	help
 
 	help
 
 	  Support for simple SAA7146 based DVB cards
 
 	  Support for simple SAA7146 based DVB cards
 
 	  (so called Budget- or Nova-PCI cards) without onboard
 
 	  (so called Budget- or Nova-PCI cards) without onboard

+ 1 - 1
drivers/media/video/bt8xx/Kconfig
View File 

@@ -4,7 +4,7 @@ config VIDEO_BT848
 
 	select I2C_ALGOBIT
 
 	select I2C_ALGOBIT
 
 	select VIDEO_BTCX
 
 	select VIDEO_BTCX
 
 	select VIDEOBUF_DMA_SG
 
 	select VIDEOBUF_DMA_SG
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
 
 	select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO

+ 1 - 1
drivers/media/video/cx18/Kconfig
View File 

@@ -3,7 +3,7 @@ config VIDEO_CX18
 
 	depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
 
 	depends on VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL
 
 	depends on INPUT	# due to VIDEO_IR
 
 	depends on INPUT	# due to VIDEO_IR
 
 	select I2C_ALGOBIT
 
 	select I2C_ALGOBIT
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_CX2341X
 
 	select VIDEO_CX2341X

+ 1 - 1
drivers/media/video/cx231xx/Kconfig
View File 

@@ -3,7 +3,7 @@ config VIDEO_CX231XX
 
 	depends on VIDEO_DEV && I2C && INPUT
 
 	depends on VIDEO_DEV && I2C && INPUT
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEOBUF_VMALLOC
 
 	select VIDEOBUF_VMALLOC
 
 	select VIDEO_CX25840
 
 	select VIDEO_CX25840

+ 1 - 1
drivers/media/video/cx23885/Kconfig
View File 

@@ -5,7 +5,7 @@ config VIDEO_CX23885
 
 	select VIDEO_BTCX
 
 	select VIDEO_BTCX
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
-	select IR_CORE
 
+	depends on IR_CORE
 
 	select VIDEOBUF_DVB
 
 	select VIDEOBUF_DVB
 
 	select VIDEOBUF_DMA_SG
 
 	select VIDEOBUF_DMA_SG
 
 	select VIDEO_CX25840
 
 	select VIDEO_CX25840

+ 1 - 1
drivers/media/video/cx88/Kconfig
View File 

@@ -6,7 +6,7 @@ config VIDEO_CX88
 
 	select VIDEOBUF_DMA_SG
 
 	select VIDEOBUF_DMA_SG
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
 
 	select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
 
 	---help---
 
 	---help---
 
 	  This is a video4linux driver for Conexant 2388x based
 
 	  This is a video4linux driver for Conexant 2388x based

+ 1 - 1
drivers/media/video/em28xx/Kconfig
View File 

@@ -3,7 +3,7 @@ config VIDEO_EM28XX
 
 	depends on VIDEO_DEV && I2C && INPUT
 
 	depends on VIDEO_DEV && I2C && INPUT
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEOBUF_VMALLOC
 
 	select VIDEOBUF_VMALLOC
 
 	select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
 
 	select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
 
 	select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO
 
 	select VIDEO_TVP5150 if VIDEO_HELPER_CHIPS_AUTO

+ 1 - 1
drivers/media/video/ivtv/Kconfig
View File 

@@ -3,7 +3,7 @@ config VIDEO_IVTV
 
 	depends on VIDEO_V4L2 && PCI && I2C
 
 	depends on VIDEO_V4L2 && PCI && I2C
 
 	depends on INPUT   # due to VIDEO_IR
 
 	depends on INPUT   # due to VIDEO_IR
 
 	select I2C_ALGOBIT
 
 	select I2C_ALGOBIT
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_CX2341X
 
 	select VIDEO_CX2341X

+ 1 - 1
drivers/media/video/saa7134/Kconfig
View File 

@@ -2,7 +2,7 @@ config VIDEO_SAA7134
 
 	tristate "Philips SAA7134 support"
 
 	tristate "Philips SAA7134 support"
 
 	depends on VIDEO_DEV && PCI && I2C && INPUT
 
 	depends on VIDEO_DEV && PCI && I2C && INPUT
 
 	select VIDEOBUF_DMA_SG
 
 	select VIDEOBUF_DMA_SG
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
 	select CRC32
 
 	select CRC32

+ 1 - 1
drivers/media/video/tlg2300/Kconfig
View File 

@@ -3,7 +3,7 @@ config VIDEO_TLG2300
 
 	depends on VIDEO_DEV && I2C && INPUT && SND && DVB_CORE
 
 	depends on VIDEO_DEV && I2C && INPUT && SND && DVB_CORE
 
 	select VIDEO_TUNER
 
 	select VIDEO_TUNER
 
 	select VIDEO_TVEEPROM
 
 	select VIDEO_TVEEPROM
 
-	select VIDEO_IR
 
+	depends on VIDEO_IR
 
 	select VIDEOBUF_VMALLOC
 
 	select VIDEOBUF_VMALLOC
 
 	select SND_PCM
 
 	select SND_PCM
 
 	select VIDEOBUF_DVB
 
 	select VIDEOBUF_DVB

+ 1 - 0
drivers/media/video/v4l2-ctrls.c
View File 

@@ -19,6 +19,7 @@
 
  */
 
  */
 
 
 
 #include <linux/ctype.h>
 
 #include <linux/ctype.h>
 
+#include <linux/slab.h>
 
 #include <media/v4l2-ioctl.h>
 
 #include <media/v4l2-ioctl.h>
 
 #include <media/v4l2-device.h>
 
 #include <media/v4l2-device.h>
 
 #include <media/v4l2-ctrls.h>
 
 #include <media/v4l2-ctrls.h>