Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / staging / tidspbridge / rmgr / drv.c

diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 8c88583..db8215f 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -609,7 +609,7 @@ int drv_request_resources(u32 dw_context, u32 *dev_node_strg)
        DBC_REQUIRE(dev_node_strg != NULL);
 
        /*
-        *  Allocate memory to hold the string. This will live untill
+        *  Allocate memory to hold the string. This will live until
         *  it is freed in the Release resources. Update the driver object
         *  list.
         */