From 89afbffab92f4e63674e117fecc1c12bba3127fd Mon Sep 17 00:00:00 2001
From: Mark Allyn <mark.a.allyn@intel.com>
Date: Thu, 9 Dec 2010 09:30:17 -0800
Subject: [PATCH] --- yaml --- r: 228351 b: refs/heads/master c:
 e957b063abdf0f005ba2c298345c75aa7ac4c22a h: refs/heads/master i:   228349:
 0250ac9ac025709aefe3b05ded703421b571c528   228347:
 c0538ad586e6ab4a7062e289aed11bfca6200238   228343:
 fc7edd6d5f070714b2d1fec51a8071bdff23725a   228335:
 69f86f25827dc728f2e1932dcac039cb7f47380a   228319:
 968a2013399a6013d92f8b6a96654fde5d030ece   228287:
 e5591c02d9ae6d9ebcd391c0603483e9cc16fdfa   228223:
 05d26015b9701baa38022911b3b143518621664c   228095:
 f7e67f07c715dfde654cc506f533c52644a56709   227839:
 4ee1a4f88c7910fafaec05711790cc64c0bd4f9f   227327:
 7b51ff961a27134d514239ae5e6ef9add1b41d87 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/sep/sep_driver.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 057b77d1a8bb..f1c0e8b59f05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f15662755f7eb3db4a416d52af24771cc208e7b0
+refs/heads/master: e957b063abdf0f005ba2c298345c75aa7ac4c22a
diff --git a/trunk/drivers/staging/sep/sep_driver.c b/trunk/drivers/staging/sep/sep_driver.c
index a5c0443b4efc..241b1b1bcaed 100644
--- a/trunk/drivers/staging/sep/sep_driver.c
+++ b/trunk/drivers/staging/sep/sep_driver.c
@@ -275,7 +275,7 @@ static int sep_singleton_open(struct inode *inode_ptr, struct file *file_ptr)
  *	@filp: file handle to SEP device
  *
  *	Open method for the SEP device. Called when userspace opens
- *	the SEP device node. 
+ *	the SEP device node.
  *
  *	Returns zero on success otherwise an error code.
  */
@@ -1811,7 +1811,7 @@ static int sep_prepare_input_dma_table(struct sep_device *sep,
 			info_entry_ptr->bus_address =
 				sep_shared_area_virt_to_bus(sep,
 							in_lli_table_ptr);
-			info_entry_ptr->block_size = 
+			info_entry_ptr->block_size =
 				((num_entries_in_table) << 24) |
 				(table_data_size);
 		}
@@ -2164,7 +2164,7 @@ static int sep_prepare_input_output_dma_table(struct sep_device *sep,
 		error = sep_lock_user_pages(sep, app_virt_in_addr,
 				data_size, &lli_in_array, SEP_DRIVER_IN_FLAG);
 		if (error) {
-			dev_warn(&sep->pdev->dev, 
+			dev_warn(&sep->pdev->dev,
 				"sep_lock_user_pages for input virtual buffer failed\n");
 			goto end_function;
 		}
@@ -2808,7 +2808,7 @@ static int sep_end_transaction_handler(struct sep_device *sep)
 }
 
 /**
- *	sep_prepare_dcb_handler - prepare a control block 
+ *	sep_prepare_dcb_handler - prepare a control block
  *	@sep: pointer to struct sep_device
  *	@arg: pointer to user parameters
  *
@@ -2873,7 +2873,7 @@ static int sep_free_dcb_handler(struct sep_device *sep)
 }
 
 /**
- *	sep_rar_prepare_output_msg_handler - prepare an output message 
+ *	sep_rar_prepare_output_msg_handler - prepare an output message
  *	@sep: pointer to struct sep_device
  *	@arg: pointer to user parameters
  *
@@ -3557,7 +3557,7 @@ static int __devinit sep_probe(struct pci_dev *pdev,
 	if (error == 0)
 		/* Success */
 		return 0;
-		
+
 end_function_free_irq:
 	free_irq(pdev->irq, sep);
 
@@ -3626,7 +3626,7 @@ static int __init sep_init(void)
 
 
 /**
- *	sep_exit - called to unload driver 
+ *	sep_exit - called to unload driver
  *
  *	Drop the misc devices then remove and unmap the various resources
  *	that are not released by the driver remove method.