Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / go7007 / Kconfig

diff --git a/drivers/staging/go7007/Kconfig b/drivers/staging/go7007/Kconfig
index 593fdb767aad2a6f87ddd3092d9170a8c9414c68..ca6ade6c4b4775f69254d3b96efe13e446e336ad 100644 (file)
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/go7007/Kconfig
@@ -10,7 +10,7 @@ config VIDEO_GO7007
        select CRC32
        default N
        ---help---
-         This is a video4linux driver for some wierd device...
+         This is a video4linux driver for some weird device...
 
          To compile this driver as a module, choose M here: the
          module will be called go7007
@@ -20,8 +20,18 @@ config VIDEO_GO7007_USB
        depends on VIDEO_GO7007 && USB
        default N
        ---help---
-         This is a video4linux driver for some wierd device...
+         This is a video4linux driver for some weird device...
 
          To compile this driver as a module, choose M here: the
          module will be called go7007-usb
 
+config VIDEO_GO7007_USB_S2250_BOARD
+       tristate "Sensoray 2250/2251 support"
+       depends on VIDEO_GO7007_USB && DVB_USB
+       default N
+       ---help---
+         This is a video4linux driver for the Sensoray 2250/2251 device
+
+         To compile this driver as a module, choose M here: the
+         module will be called s2250-board
+