Merge commit 'v2.6.39-rc3' into for-2.6.39

[~andy/linux] / drivers / block / DAC960.c

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 79882104e431a283235b3e1cdee24343429366eb..8066d086578a7124a4873bb8376389dc9a010be9 100644 (file)
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -1790,7 +1790,7 @@ static bool DAC960_V2_ReadControllerConfiguration(DAC960_Controller_T
   unsigned short LogicalDeviceNumber = 0;
   int ModelNameLength;
 
-  /* Get data into dma-able area, then copy into permanant location */
+  /* Get data into dma-able area, then copy into permanent location */
   if (!DAC960_V2_NewControllerInfo(Controller))
     return DAC960_Failure(Controller, "GET CONTROLLER INFO");
   memcpy(ControllerInfo, Controller->V2.NewControllerInformation,