Merge commit 'v2.6.39-rc4' into next

[karo-tx-linux.git] / drivers / uwb / driver.c

diff --git a/drivers/uwb/driver.c b/drivers/uwb/driver.c
index 08bd6dbfd4a6d03acf870d4328633e05dd0db401..3e5454aba5d4b3e37303b9ec7f8ebcfd229b96e2 100644 (file)
--- a/drivers/uwb/driver.c
+++ b/drivers/uwb/driver.c
@@ -61,7 +61,7 @@
 
 
 /**
- * If a beacon dissapears for longer than this, then we consider the
+ * If a beacon disappears for longer than this, then we consider the
  * device who was represented by that beacon to be gone.
  *
  * ECMA-368[17.2.3, last para] establishes that a device must not