Merge branch 'pmtimer-overflow' into release

[linux-2.6-omap-h63xx.git] / arch / parisc / hpux / ioctl.c

diff --git a/arch/parisc/hpux/ioctl.c b/arch/parisc/hpux/ioctl.c
index b34b4f3c60ec6cf087f25b31b64e5bd448604067..dede4765852edb140c24acfc99d30d5e602554b9 100644 (file)
--- a/arch/parisc/hpux/ioctl.c
+++ b/arch/parisc/hpux/ioctl.c
@@ -34,7 +34,6 @@
  */
 
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <asm/errno.h>
 #include <asm/ioctl.h>