Merge 'staging-next' to Linus's tree

[pandora-kernel.git] / drivers / staging / frontier / alphatrack.c

diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index 689099b..ef7fbf8 100644 (file)
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -672,7 +672,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
        int true_size;
        int retval = -ENOMEM;
 
-       /* allocate memory for our device state and intialize it */
+       /* allocate memory for our device state and initialize it */
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (dev == NULL) {