Merge commit 'v2.6.30-rc5' into x86/apic

Merge reason: this branch was on a .30-rc2 base - sync it up with
              all the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 22 insertions, 22 deletions

diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
index 91156546a07a..477d4ab5e9ac 100644
--- a/drivers/media/video/cx231xx/Kconfig
+++ b/drivers/media/video/cx231xx/Kconfig
@@ -1,12 +1,11 @@
 config VIDEO_CX231XX
-       tristate "Conexant cx231xx USB video capture support"
-       depends on VIDEO_DEV && I2C && INPUT
-       select VIDEO_TUNER
-       select VIDEO_TVEEPROM
-       select VIDEO_IR
-       select VIDEOBUF_VMALLOC
-       select VIDEO_CX25840
-       select VIDEO_CX231XX_ALSA
+        tristate "Conexant cx231xx USB video capture support"
+        depends on VIDEO_DEV && I2C && INPUT
+        select VIDEO_TUNER
+        select VIDEO_TVEEPROM
+        select VIDEO_IR
+        select VIDEOBUF_VMALLOC
+        select VIDEO_CX25840
 
         ---help---
           This is a video4linux driver for Conexant 231xx USB based TV cards.
@@ -15,21 +14,22 @@ config VIDEO_CX231XX
           module will be called cx231xx
 
 config VIDEO_CX231XX_ALSA
-    tristate "Conexant Cx231xx ALSA audio module"
-       depends on VIDEO_CX231XX && SND
-       select SND_PCM
+        tristate "Conexant Cx231xx ALSA audio module"
+        depends on VIDEO_CX231XX && SND
+        select SND_PCM
 
-       ---help---
-         This is an ALSA driver for Cx231xx USB based TV cards.
+        ---help---
+          This is an ALSA driver for Cx231xx USB based TV cards.
 
-         To compile this driver as a module, choose M here: the
-         module will be called cx231xx-alsa
+          To compile this driver as a module, choose M here: the
+          module will be called cx231xx-alsa
 
 config VIDEO_CX231XX_DVB
-       tristate "DVB/ATSC Support for Cx231xx based TV cards"
-       depends on VIDEO_CX231XX && DVB_CORE
-       select VIDEOBUF_DVB
-       select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
-       ---help---
-         This adds support for DVB cards based on the
-         Conexant cx231xx chips.
+        tristate "DVB/ATSC Support for Cx231xx based TV cards"
+        depends on VIDEO_CX231XX && DVB_CORE
+        select VIDEOBUF_DVB
+        select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
+
+        ---help---
+          This adds support for DVB cards based on the
+          Conexant cx231xx chips.