Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / frontier / alphatrack.c

diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index 4e52105e6070a9776c051311bd5df2fbb8a425d1..ef7fbf8b069a58dea52e0374be2afcb575c79983 100644 (file)
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -641,6 +641,7 @@ static const struct file_operations usb_alphatrack_fops = {
        .open = usb_alphatrack_open,
        .release = usb_alphatrack_release,
        .poll = usb_alphatrack_poll,
+       .llseek = no_llseek,
 };
 
 /*
@@ -671,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) {