merge whitespace cleanups from kernel tree

6 files changed, 14 insertions, 14 deletions

diff --git a/linux/drivers/media/dvb/b2c2/Kconfig b/linux/drivers/media/dvb/b2c2/Kconfig
index 33e161849..52250307c 100644
--- a/linux/drivers/media/dvb/b2c2/Kconfig
+++ b/linux/drivers/media/dvb/b2c2/Kconfig
@@ -9,7 +9,7 @@ config DVB_B2C2_FLEXCOP
 	help
 	  Support for the digital TV receiver chip made by B2C2 Inc. included in
 	  Technisats PCI cards and USB boxes.
-	  
+
 	  Say Y if you own such a device and want to use it.
 
 config DVB_B2C2_FLEXCOP_PCI
@@ -32,7 +32,7 @@ config DVB_B2C2_FLEXCOP_DEBUG
 	bool "Enable debug for the B2C2 FlexCop drivers"
 	depends on DVB_B2C2_FLEXCOP
 	help
-	  Say Y if you want to enable the module option to control debug messages 
+	  Say Y if you want to enable the module option to control debug messages
 	  of all B2C2 FlexCop drivers.
 
 config DVB_B2C2_SKYSTAR
@@ -45,7 +45,7 @@ config DVB_B2C2_SKYSTAR
 	help
 	  This driver has been obsoleted by the FlexCop driver set above.
 	  Please don't use this driver unless you have serious problems.
-	  
+
 	  Support for the Skystar2 PCI DVB card by Technisat, which
 	  is equipped with the FlexCopII chipset by B2C2, and
 	  for the B2C2/BBTI Air2PC-ATSC card.
diff --git a/linux/drivers/media/dvb/b2c2/Makefile b/linux/drivers/media/dvb/b2c2/Makefile
index 9ea964b18..7703812af 100644
--- a/linux/drivers/media/dvb/b2c2/Makefile
+++ b/linux/drivers/media/dvb/b2c2/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
 b2c2-flexcop-pci-objs = flexcop-pci.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
 
-b2c2-flexcop-usb-objs = flexcop-usb.o 
+b2c2-flexcop-usb-objs = flexcop-usb.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
 
 obj-$(CONFIG_DVB_B2C2_SKYSTAR) += skystar2.o
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 124b25182..b3dd16fb5 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -240,7 +240,7 @@ static struct stv0299_config samsung_tbmu24112_config = {
 	.volt13_op0_op1 = STV0299_VOLT13_OP1,
 	.min_delay_ms = 100,
 	.set_symbol_rate = samsung_tbmu24112_set_symbol_rate,
-   	.pll_set = samsung_tbmu24112_pll_set,
+	.pll_set = samsung_tbmu24112_pll_set,
 };
 
 /* dvb-t mt352 */
@@ -277,9 +277,9 @@ static int samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct dvb_front
 
 	pllbuf[0] = 0xc2; /* Note: non-linux standard PLL i2c address */
 	pllbuf[1] = div >> 8;
-   	pllbuf[2] = div & 0xff;
-   	pllbuf[3] = 0xcc;
-   	pllbuf[4] = bs;
+	pllbuf[2] = div & 0xff;
+	pllbuf[3] = 0xcc;
+	pllbuf[4] = bs;
 
 	return 0;
 }
@@ -288,7 +288,7 @@ static struct mt352_config samsung_tdtc9251dh0_config = {
 
 	.demod_address = 0x0f,
 	.demod_init = samsung_tdtc9251dh0_demod_init,
-   	.pll_set = samsung_tdtc9251dh0_pll_set,
+	.pll_set = samsung_tdtc9251dh0_pll_set,
 };
 
 static int nxt2002_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
@@ -327,7 +327,7 @@ static int skystar23_samsung_tbdu18132_pll_set(struct dvb_frontend* fe, struct d
 static struct mt312_config skystar23_samsung_tbdu18132_config = {
 
 	.demod_address = 0x0e,
-   	.pll_set = skystar23_samsung_tbdu18132_pll_set,
+	.pll_set = skystar23_samsung_tbdu18132_pll_set,
 };
 
 static struct stv0297_config alps_tdee4_stv0297_config = {
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c
index 162747e6e..be4266d4a 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -189,7 +189,7 @@ int flexcop_i2c_init(struct flexcop_device *fc)
 
 	i2c_set_adapdata(&fc->i2c_adap,fc);
 
-	fc->i2c_adap.class 	    = I2C_CLASS_TV_DIGITAL;
+	fc->i2c_adap.class	    = I2C_CLASS_TV_DIGITAL;
 	fc->i2c_adap.algo       = &flexcop_algo;
 	fc->i2c_adap.algo_data  = NULL;
 	fc->i2c_adap.id         = I2C_ALGO_BIT;
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-pci.c b/linux/drivers/media/dvb/b2c2/flexcop-pci.c
index 210d2fcef..ed717c007 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -165,7 +165,7 @@ static int flexcop_pci_stream_control(struct flexcop_device *fc, int onoff)
 			flexcop_dma_control_timer_irq(fc,FC_DMA_1,1);
 		} else {
 			fc_pci->active_dma1_addr = 0;
-	 		flexcop_dma_control_size_irq(fc,FC_DMA_1,1);
+			flexcop_dma_control_size_irq(fc,FC_DMA_1,1);
 		}
 
 /*		flexcop_dma_config_packet_count(fc,FC_DMA_1,0xc0);
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-usb.c b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
index 6ab4a96d7..0113449ab 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -546,9 +546,9 @@ static struct usb_device_id flexcop_usb_table [] = {
 static struct usb_driver flexcop_usb_driver = {
 	.owner		= THIS_MODULE,
 	.name		= "Technisat/B2C2 FlexCop II/IIb/III USB",
-	.probe 		= flexcop_usb_probe,
+	.probe		= flexcop_usb_probe,
 	.disconnect = flexcop_usb_disconnect,
-	.id_table 	= flexcop_usb_table,
+	.id_table	= flexcop_usb_table,
 };
 
 /* module stuff */