Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / char / stallion.c

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index f2167f8e5aab631acbf56cd91338bdd60644942e..461a5a0455170b63807b1945451d69c9f1abd1fd 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -40,7 +40,6 @@
 #include <linux/stallion.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
@@ -608,6 +607,7 @@ static unsigned int sc26198_baudtable[] = {
 static const struct file_operations    stl_fsiomem = {
        .owner          = THIS_MODULE,
        .unlocked_ioctl = stl_memioctl,
+       .llseek         = noop_llseek,
 };
 
 static struct class *stallion_class;
@@ -3180,7 +3180,7 @@ static void stl_cd1400flush(struct stlport *portp)
 
 /*
  *     Return the current state of data flow on this port. This is only
- *     really interresting when determining if data has fully completed
+ *     really interesting when determining if data has fully completed
  *     transmission or not... This is easy for the cd1400, it accurately
  *     maintains the busy port flag.
  */
@@ -4130,7 +4130,7 @@ static void stl_sc26198flush(struct stlport *portp)
 
 /*
  *     Return the current state of data flow on this port. This is only
- *     really interresting when determining if data has fully completed
+ *     really interesting when determining if data has fully completed
  *     transmission or not... The sc26198 interrupt scheme cannot
  *     determine when all data has actually drained, so we need to
  *     check the port statusy register to be sure.